diff --git a/.env.ci b/.env.ci
index e99f46691..991f47a98 100644
--- a/.env.ci
+++ b/.env.ci
@@ -5,6 +5,7 @@ APP_THEME=pterodactyl
 APP_TIMEZONE=America/Los_Angeles
 APP_URL=http://localhost/
 
+DB_CONNECTION=testing
 TESTING_DB_HOST=127.0.0.1
 TESTING_DB_DATABASE=panel_test
 TESTING_DB_USERNAME=root
diff --git a/.env.example b/.env.example
index 72a0a764e..e2e9d2dce 100644
--- a/.env.example
+++ b/.env.example
@@ -8,6 +8,7 @@ APP_DELETE_MINUTES=10
 APP_ENVIRONMENT_ONLY=true
 LOG_CHANNEL=daily
 APP_LOCALE=en
+APP_URL=http://panel.example.com
 
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -30,7 +31,7 @@ MAILGUN_ENDPOINT=api.mailgun.net
 # mail servers such as Gmail to reject your mail.
 #
 # @see: https://github.com/pterodactyl/panel/pull/3110
-# SERVER_NAME=panel.yourdomain.com
+# SERVER_NAME=panel.example.com
 
 QUEUE_HIGH=high
 QUEUE_STANDARD=standard
diff --git a/.eslintrc.yml b/.eslintrc.yml
index a4630dcb8..1c3adcb14 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -43,6 +43,10 @@ rules:
   array-bracket-spacing:
     - warn
     - always
+  "@typescript-eslint/no-unused-vars":
+    - warn
+    - argsIgnorePattern: '^_'
+      varsIgnorePattern: '^_'
   # Remove errors for not having newlines between operands of ternary expressions https://eslint.org/docs/rules/multiline-ternary
   multiline-ternary: 0
   "react-hooks/rules-of-hooks":
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index b2a9113ac..adf3d2738 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -7,14 +7,6 @@ body:
     value: |
       Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](https://discord.gg/pterodactyl).
 
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    description: Please [search here](https://github.com/pterodactyl/panel/issues) to see if an issue already exists for your problem.
-    options:
-    - label: I have searched the existing issues before opening this issue.
-      required: true
-
 - type: textarea      
   attributes:
     label: Current Behavior
@@ -32,7 +24,7 @@ body:
 - type: textarea      
   attributes:
     label: Steps to Reproduce
-    description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will likely result in this issue being closed.
+    description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will result in this issue being closed.
   validations:
     required: true
 
@@ -53,6 +45,20 @@ body:
     placeholder: 1.4.2
   validations:
     required: true
+    
+- type: input
+  id: egg-details
+  attributes:
+    label: Games and/or Eggs Affected
+    description: Please include the specific game(s) or egg(s) you are running into this bug with.
+    placeholder: Minecraft (Paper), Minecraft (Forge)
+ 
+- type: input
+  id: docker-image
+  attributes:
+    label: Docker Image
+    description: The specific Docker image you are using for the game(s) above.
+    placeholder: ghcr.io/pterodactyl/yolks:java_17
 
 - type: textarea
   id: panel-logs
@@ -67,3 +73,15 @@ body:
     render: bash
   validations:
     required: false
+    
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: Please [search here](https://github.com/pterodactyl/panel/issues) to see if an issue already exists for your problem.
+    options:
+    - label: I have searched the existing issues before opening this issue.
+      required: true
+    - label: I have provided all relevant details, including the specific game and Docker images I am using if this issue is related to running a server.
+      required: true
+    - label: I have checked in the Discord server and believe this is a bug with the software, and not a configuration issue with my specific system.
+      required: true
diff --git a/.github/docker/README.md b/.github/docker/README.md
index 434e509d6..b195b8300 100644
--- a/.github/docker/README.md
+++ b/.github/docker/README.md
@@ -12,7 +12,7 @@ You can provide additional settings using a custom `.env` file or by setting the
 
 ## Setup
 
-Start the docker container and the required dependencies (either provide existing ones or start containers as well, see the [docker-compose.yml](docker-compose.yml) file as an example).
+Start the docker container and the required dependencies (either provide existing ones or start containers as well, see the [docker-compose.yml](https://github.com/pterodactyl/panel/blob/develop/docker-compose.example.yml) file as an example.
 
 After the startup is complete you'll need to create a user.
 If you are running the docker container without docker-compose, use:
@@ -33,7 +33,7 @@ Note: If your `APP_URL` starts with `https://` you need to provide an `LETSENCRY
 | ------------------- | ------------------------------------------------------------------------------ | -------- |
 | `APP_URL`           | The URL the panel will be reachable with (including protocol)                  | yes      |
 | `APP_TIMEZONE`      | The timezone to use for the panel                                              | yes      |
-| `LETSENCRYPT_EMAIL` | The email used for letsencrypt certificate generation                          | yes      |
+| `LE_EMAIL`          | The email used for letsencrypt certificate generation                          | yes      |
 | `DB_HOST`           | The host of the mysql instance                                                 | yes      |
 | `DB_PORT`           | The port of the mysql instance                                                 | yes      |
 | `DB_DATABASE`       | The name of the mysql database                                                 | yes      |
diff --git a/.github/docker/entrypoint.sh b/.github/docker/entrypoint.sh
index e6e1b0966..d3df9c150 100644
--- a/.github/docker/entrypoint.sh
+++ b/.github/docker/entrypoint.sh
@@ -30,7 +30,7 @@ else
 fi
 
 echo "Checking if https is required."
-if [ -f /etc/nginx/conf.d/default.conf ]; then
+if [ -f /etc/nginx/http.d/panel.conf ]; then
   echo "Using nginx config already in place."
   if [ $LE_EMAIL ]; then
     echo "Checking for cert update"
@@ -42,20 +42,27 @@ else
   echo "Checking if letsencrypt email is set."
   if [ -z $LE_EMAIL ]; then
     echo "No letsencrypt email is set using http config."
-    cp .github/docker/default.conf /etc/nginx/conf.d/default.conf
+    cp .github/docker/default.conf /etc/nginx/http.d/panel.conf
   else
     echo "writing ssl config"
-    cp .github/docker/default_ssl.conf /etc/nginx/conf.d/default.conf
+    cp .github/docker/default_ssl.conf /etc/nginx/http.d/panel.conf
     echo "updating ssl config for domain"
-    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf
+    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/http.d/panel.conf
     echo "generating certs"
     certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
   fi
+  echo "Removing the default nginx config"
+  rm -rf /etc/nginx/http.d/default.conf
+fi
+
+if [[ -z $DB_PORT ]]; then
+  echo -e "DB_PORT not specified, defaulting to 3306"
+  DB_PORT=3306
 fi
 
 ## check for DB up before starting the panel
 echo "Checking database status."
-until nc -z -v -w30 $DB_HOST 3306
+until nc -z -v -w30 $DB_HOST $DB_PORT
 do
   echo "Waiting for database connection..."
   # wait for 1 seconds before check again
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1aa6125f4..c9f5c68ae 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -36,6 +36,7 @@ jobs:
         if: "!contains(github.ref, 'develop')"
         with:
           push: true
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
       - name: Release Development Build
@@ -43,5 +44,6 @@ jobs:
         if: "contains(github.ref, 'develop')"
         with:
           push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3143871b0..46b07fe22 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -37,9 +37,7 @@ jobs:
           path: |
             ~/.php_cs.cache
             ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cache-${{ matrix.php }}-
+          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('composer.lock') }}
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -52,16 +50,22 @@ jobs:
       - name: composer install
         run: composer install --prefer-dist --no-interaction --no-progress
       - name: Run cs-fixer
-        run: vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff --config .php-cs-fixer.dist.php
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff --format=txt --config .php-cs-fixer.dist.php
         continue-on-error: true
+      - name: Static Analysis
+        if: ${{ matrix.php }} == '8.0'
+        run: |
+          php artisan ide-helper:models -N
+          ./vendor/bin/phpstan analyse --memory-limit=2G
+        env:
+          TESTING_DB_PORT: ${{ job.services.database.ports[3306] }}
       - name: Execute Unit Tests
         run: php artisan test tests/Unit
         if: ${{ always() }}
         env:
           TESTING_DB_PORT: ${{ job.services.database.ports[3306] }}
-          TESTING_DB_USERNAME: root
       - name: Execute Integration Tests
         run: php artisan test tests/Integration
+        if: ${{ always() }}
         env:
           TESTING_DB_PORT: ${{ job.services.database.ports[3306] }}
-          TESTING_DB_USERNAME: root
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 9245b7e6e..b2a25ca19 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -10,6 +10,9 @@ $finder = (new Finder())
         'node_modules',
         'storage',
         'bootstrap/cache',
+        '.phpstorm.meta.php',
+        '_ide_helper.php',
+        '_ide_helper_models.php',
     ])
     ->notName(['_ide_helper*']);
 
diff --git a/BUILDING.md b/BUILDING.md
index df60f70a8..d8b703338 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -5,9 +5,9 @@ Release versions of Pterodactyl will include pre-compiled, minified, and hashed
 However, if you are interested in running custom themes or making modifications to the React files you'll need a build
 system in place to generate these compiled assets. To get your environment setup you'll need at minimum:
 
-* Node.js 12
-* [Yarn](https://classic.yarnpkg.com/lang/en/) v1
-* [Go](https://golang.org/) 1.15.
+* [Node.js](https://nodejs.org/en/) v14.x.x
+* [Yarn](https://classic.yarnpkg.com/lang/en/) v1.x.x
+* [Go](https://golang.org/) 1.17.x
 
 ### Install Dependencies
 ```bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b3da3007..78a403449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,62 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.7.0
+### Fixed
+* Fixes typo in message shown to user when deleting a database.
+* Fixes formatting of IPv6 addresses when displaying allocations to users.
+* Fixes an exception thrown while trying to return error messages from API endpoints that inproperly masked the true underlying error.
+* Fixes SSL certificate path generation for Let's Encrypt by ensuring they are always transformed to lowercase.
+* Removes duplicate entries when creating a nested folder in the file manager.
+* Fixes missing validation of Egg Author email addresses during the setup process that could cause unexpected failures later on.
+* Fixes font rendering issues of the console on Firefox due to an outdated version of xterm.js being used.
+* Fixes display overlap issues of the two-factor configuration form in a user's settings.
+* **[security]** When authenticating using an API key a user session is now only persisted for the duration of the request before being destroyed.
+
+### Changed
+* CPU graph changed to show the maximum amount of CPU available to a server to better match how the memory graph is displayed.
+
+### Added
+* Adds support for `DB_PORT` environment variable in the Docker enterpoint for the Panel image.
+* Adds suport for ARM environments in the Docker image.
+* Adds a new warning modal for Steam servers shown when an invalid Game Server Login Token (GSL Token) is detected.
+* Adds a new warning modal for Steam servers shown when the installation process runs out of available disk space.
+* Adds a new warning modal for Minecraft servers shown when a server exceeds the maximum number of child processes.
+* Adds support for displaying certain server variable fields as a checkbox when they're detected as using `boolean` or `in:0,1` validation rules.
+* Adds support for Pug and Jade in the file editor.
+* Adds an entry to the `robots.txt` file to correctly disallow all bot indexing.
+
+
+## v1.6.6
+### Fixed
+* **[security]** Fixes a CSRF vulnerability for both the administrative test email endpoint and node auto-deployment token generation endpoint. [GHSA-wwgq-9jhf-qgw6](https://github.com/pterodactyl/panel/security/advisories/GHSA-wwgq-9jhf-qgw6)
+
+### Changed
+* Updates Minecraft eggs to include latest Java 17 yolk by default.
+
+## v1.6.5
+### Fixed
+* Fixes broken application API endpoints due to changes introduced with session management in 1.6.4.
+
+## v1.6.4
+_This release should not be used, please use `1.6.5`. It has been pulled from our releases._
+
+### Fixed
+* Fixes a session management bug that would cause a user who signs out of one browser to be unintentionally logged out of other browser sessions when using the client API.
+
+## v1.6.3
+### Fixed
+* **[Security]** Changes logout endpoint to be a POST request with CSRF-token validation to prevent a malicious actor from triggering a user logout.
+* Fixes Wings receiving the wrong server suspension state when syncing servers.
+
+### Added
+* Adds additional throttling to login and password reset endpoints.
+* Adds server uptime display when viewing a server console.
+
+## v1.6.2
+### Fixed
+* **[Security]** Fixes an authentication bypass vulerability that could allow a malicious actor to login as another user in the Panel without knowing that user's email or password.
+
 ## v1.6.1
 ### Fixed
 * Fixes server build modifications not being properly persisted to the database when edited.
diff --git a/Dockerfile b/Dockerfile
index 8d50d3845..2c743cab2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # Build the assets that are needed for the frontend. This build stage is then discarded
 # since we won't need NodeJS anymore in the future. This Docker image ships a final production
 # level distribution of Pterodactyl.
-FROM mhart/alpine-node:14
+FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
 WORKDIR /app
 COPY . ./
 RUN yarn install --frozen-lockfile \
@@ -10,11 +10,11 @@ RUN yarn install --frozen-lockfile \
 
 # Stage 1:
 # Build the actual container with all of the needed PHP dependencies that will run the application.
-FROM php:7.4-fpm-alpine
+FROM --platform=$TARGETOS/$TARGETARCH php:7.4-fpm-alpine
 WORKDIR /app
 COPY . ./
 COPY --from=0 /app/public/assets ./public/assets
-RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot \
+RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot certbot-nginx \
     && docker-php-ext-configure zip \
     && docker-php-ext-install bcmath gd pdo_mysql zip \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
@@ -27,6 +27,7 @@ RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar un
 
 RUN rm /usr/local/etc/php-fpm.conf \
     && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
+    && echo "0 23 * * * certbot renew --nginx --quiet" >> /var/spool/cron/crontabs/root \
     && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
     && mkdir -p /var/run/php /var/run/nginx
 
@@ -35,5 +36,5 @@ COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf
 COPY .github/docker/supervisord.conf /etc/supervisord.conf
 
 EXPOSE 80 443
-ENTRYPOINT ["/bin/ash", ".github/docker/entrypoint.sh"]
+ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]
diff --git a/LICENSE.md b/LICENSE.md
index 1fb886e97..cb0e2a9d9 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,8 @@
 # The MIT License (MIT)
 
 ```
-Copyright (c) 2015 - 2021 Dane Everitt <dane@daneeveritt.com> and Contributors
+Pterodactyl®
+Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 42e02d5c0..5357c02c8 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 ![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge)
 
 # Pterodactyl Panel
-Pterodactyl is an open-source game server management panel built with PHP 7, React, and Go. Designed with security 
+Pterodactyl® is a free, open-source game server management panel built with PHP, React, and Go. Designed with security 
 in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive
 UI to end users.
 
@@ -14,6 +14,12 @@ Stop settling for less. Make game servers a first class citizen on your platform
 
 ![Image](https://cdn.pterodactyl.io/site-assets/pterodactyl_v1_demo.gif)
 
+## Documentation
+* [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)
+* [Wings Documentation](https://pterodactyl.io/wings/1.0/installing.html)
+* [Community Guides](https://pterodactyl.io/community/about.html)
+* Or, get additional help [via Discord](https://discord.gg/pterodactyl)
+
 ## Sponsors
 I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's developement.
 [Interested in becoming a sponsor?](https://github.com/sponsors/DaneEveritt)
@@ -32,21 +38,16 @@ I would like to extend my sincere thanks to the following sponsors for helping f
 | [**Spill Hosting**](https://spillhosting.no/) | Spill Hosting is a Norwegian hosting service, which aims for inexpensive services on quality servers. Premium i9-9900K processors will run your game like a dream. |
 | [**DeinServerHost**](https://deinserverhost.de/) | DeinServerHost offers Dedicated, vps and Gameservers for many popular Games like Minecraft and Rust in Germany since 2013. |
 | [**HostBend**](https://hostbend.com/) | HostBend offers a variety of solutions for developers, students, and others who have a tight budget but don't want to compromise quality and support. |
-| [**Capitol Hosting Solutions**](https://capitolsolutions.cloud/) | CHS is *the* budget friendly hosting company for Australian and American gamers, offering a variety of plans from Web Hosting to Game Servers; Custom Solutions too! |
+| [**Capitol Hosting Solutions**](https://chs.gg/) | CHS is *the* budget friendly hosting company for Australian and American gamers, offering a variety of plans from Web Hosting to Game Servers; Custom Solutions too! |
 | [**ByteAnia**](https://byteania.com/?utm_source=pterodactyl) | ByteAnia offers the best performing and most affordable **Ryzen 5000 Series hosting** on the market for *unbeatable prices*! |
 | [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand. |
 | [**VibeGAMES**](https://vibegames.net/) | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa.|
 | [**RocketNode**](https://rocketnode.net) | RocketNode is a VPS and Game Server provider that offers the best performing VPS and Game hosting Solutions at affordable prices! |
-
-## Documentation
-* [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)
-* [Wings Documentation](https://pterodactyl.io/wings/1.0/installing.html)
-* [Community Guides](https://pterodactyl.io/community/about.html)
-* Or, get additional help [via Discord](https://discord.gg/pterodactyl)
+| [**HostEZ**](https://hostez.io) | Providing North America Valheim, Minecraft and other popular games with low latency, high uptime and maximum availability. EZ! |
 
 ### Supported Games
-We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to
-host your games across the world without having to bloat each physical machine with additional dependencies.
+Pterodactyl supports a wide variety of games by utilizing Docker containers to isolate each instance. This gives
+you the power to run game servers without bloating machines with a host of additional dependencies.
 
 Some of our core supported games include:
 
@@ -73,27 +74,6 @@ and there are plenty more games available provided by the community. Some of the
 * [and many more...](https://github.com/parkervcp/eggs)
 
 ## License
-```
-Copyright (c) 2015 - 2021 Dane Everitt <dane@daneeveritt.com> and Contributors
+Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-```
-
-Some Javascript and CSS used within the panel are licensed under a `MIT` or `Apache 2.0` license. Please check their
-respective header files for more information.
+Code released under the [MIT License](./LICENSE.md).
diff --git a/SECURITY.md b/SECURITY.md
index 5b412f853..673a38ee3 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,18 +5,13 @@ The following versions of Pterodactyl are receiving active support and maintenan
 
 | Panel | Daemon       | Supported          |
 | ----- | ------------ | ------------------ |
-| 1.4.x | wings@1.4.x  | :white_check_mark: |
-| 1.3.x | wings@1.3.x  | :x: |
-| 1.2.x | wings@1.2.x  | :x: |
-| 1.1.x | wings@1.1.x  | :x: |
-| 1.0.x | wings@1.0.x  | :x: |
+| 1.7.x | wings@1.5.x  | :white_check_mark: |
 | 0.7.x | daemon@0.6.x | :x: |
-| 0.6.x | daemon@0.5.x | :x:                |
-| 0.5.x | daemon@0.4.x | :x:                |
+
 
 ## Reporting a Vulnerability
 
-Please reach out directly to any project team member on Discord when reporting a security vulnerability, or you can send an email to `dane [ät] pterodactyl.io`.
+Please reach out directly to any project team member on Discord when reporting a security vulnerability, or you can send an email to `dane@pterodactyl.io`.
 
 We make every effort to respond as soon as possible, although it may take a day or two for us to sync internally and determine the severity of the report and its impact. Please, _do not_ use a public facing channel or GitHub issues to report sensitive security issues.
 
diff --git a/app/Console/Commands/Environment/AppSettingsCommand.php b/app/Console/Commands/Environment/AppSettingsCommand.php
index cfe1d7981..2746d1a4f 100644
--- a/app/Console/Commands/Environment/AppSettingsCommand.php
+++ b/app/Console/Commands/Environment/AppSettingsCommand.php
@@ -12,6 +12,7 @@ namespace Pterodactyl\Console\Commands\Environment;
 use DateTimeZone;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
+use Illuminate\Validation\Factory as ValidatorFactory;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
@@ -78,12 +79,13 @@ class AppSettingsCommand extends Command
     /**
      * AppSettingsCommand constructor.
      */
-    public function __construct(ConfigRepository $config, Kernel $command)
+    public function __construct(ConfigRepository $config, Kernel $command, ValidatorFactory $validator)
     {
         parent::__construct();
 
-        $this->command = $command;
         $this->config = $config;
+        $this->command = $command;
+        $this->validator = $validator;
     }
 
     /**
@@ -103,6 +105,18 @@ class AppSettingsCommand extends Command
             $this->config->get('pterodactyl.service.author', 'unknown@unknown.com')
         );
 
+        $validator = $this->validator->make(
+            ['email' => $this->variables['APP_SERVICE_AUTHOR']],
+            ['email' => 'email']
+        );
+
+        if ($validator->fails()) {
+            foreach ($validator->errors()->all() as $error) {
+                $this->output->error($error);
+            }
+            return 1;
+        }
+
         $this->output->comment(trans('command/messages.environment.app.app_url_help'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
             trans('command/messages.environment.app.app_url'),
diff --git a/app/Console/Commands/InfoCommand.php b/app/Console/Commands/InfoCommand.php
index e712fd1e4..6e9a2c827 100644
--- a/app/Console/Commands/InfoCommand.php
+++ b/app/Console/Commands/InfoCommand.php
@@ -54,15 +54,15 @@ class InfoCommand extends Command
         $this->output->title('Version Information');
         $this->table([], [
             ['Panel Version', $this->config->get('app.version')],
-            ['Latest Version', $this->versionService->getPanel()],
+            ['Latest Version', $this->versionService->getLatestPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
             ['Unique Identifier', $this->config->get('pterodactyl.service.author')],
         ], 'compact');
 
         $this->output->title('Application Configuration');
         $this->table([], [
-            ['Environment', $this->formatText($this->config->get('app.env'), $this->config->get('app.env') === 'production' ?: 'bg=red')],
-            ['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', !$this->config->get('app.debug') ?: 'bg=red')],
+            ['Environment', $this->formatText($this->config->get('app.env'), $this->config->get('app.env') === 'production' ? '' : 'bg=red')],
+            ['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', !$this->config->get('app.debug') ? '' : 'bg=red')],
             ['Installation URL', $this->config->get('app.url')],
             ['Installation Directory', base_path()],
             ['Timezone', $this->config->get('app.timezone')],
diff --git a/app/Console/Commands/Location/DeleteLocationCommand.php b/app/Console/Commands/Location/DeleteLocationCommand.php
index 898dbb924..d1fb951d8 100644
--- a/app/Console/Commands/Location/DeleteLocationCommand.php
+++ b/app/Console/Commands/Location/DeleteLocationCommand.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\Location;
 
@@ -26,9 +19,9 @@ class DeleteLocationCommand extends Command
     protected $description = 'Deletes a location from the Panel.';
 
     /**
-     * @var \Illuminate\Support\Collection
+     * @var \Illuminate\Support\Collection|null
      */
-    protected $locations;
+    protected $locations = null;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
diff --git a/app/Console/Commands/Overrides/SeedCommand.php b/app/Console/Commands/Overrides/SeedCommand.php
index 5f050e340..7b7b5edb7 100644
--- a/app/Console/Commands/Overrides/SeedCommand.php
+++ b/app/Console/Commands/Overrides/SeedCommand.php
@@ -13,14 +13,14 @@ class SeedCommand extends BaseSeedCommand
      * Block someone from running this seed command if they have not completed
      * the migration process.
      */
-    public function handle()
+    public function handle(): int
     {
         if (!$this->hasCompletedMigrations()) {
             $this->showMigrationWarning();
 
-            return;
+            return 1;
         }
 
-        parent::handle();
+        return parent::handle();
     }
 }
diff --git a/app/Console/Commands/Overrides/UpCommand.php b/app/Console/Commands/Overrides/UpCommand.php
index 3001edcbe..0a7caaeb7 100644
--- a/app/Console/Commands/Overrides/UpCommand.php
+++ b/app/Console/Commands/Overrides/UpCommand.php
@@ -13,14 +13,14 @@ class UpCommand extends BaseUpCommand
      * Block someone from running this up command if they have not completed
      * the migration process.
      */
-    public function handle()
+    public function handle(): int
     {
         if (!$this->hasCompletedMigrations()) {
             $this->showMigrationWarning();
 
-            return;
+            return 1;
         }
 
-        parent::handle();
+        return parent::handle();
     }
 }
diff --git a/app/Console/Commands/Schedule/ProcessRunnableCommand.php b/app/Console/Commands/Schedule/ProcessRunnableCommand.php
index 9e51feaeb..d2a7ec661 100644
--- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php
+++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php
@@ -24,7 +24,7 @@ class ProcessRunnableCommand extends Command
     /**
      * Handle command execution.
      */
-    public function handle()
+    public function handle(): int
     {
         $schedules = Schedule::query()->with('tasks')
             ->where('is_active', true)
@@ -35,7 +35,7 @@ class ProcessRunnableCommand extends Command
         if ($schedules->count() < 1) {
             $this->line('There are no scheduled tasks for servers that need to be run.');
 
-            return;
+            return 0;
         }
 
         $bar = $this->output->createProgressBar(count($schedules));
@@ -47,6 +47,8 @@ class ProcessRunnableCommand extends Command
         }
 
         $this->line('');
+
+        return 0;
     }
 
     /**
@@ -69,7 +71,7 @@ class ProcessRunnableCommand extends Command
                 'schedule' => $schedule->name,
                 'hash' => $schedule->hashid,
             ]));
-        } catch (Throwable | Exception $exception) {
+        } catch (Throwable|Exception $exception) {
             Log::error($exception, ['schedule_id' => $schedule->id]);
 
             $this->error("An error was encountered while processing Schedule #{$schedule->id}: " . $exception->getMessage());
diff --git a/app/Console/Commands/UpgradeCommand.php b/app/Console/Commands/UpgradeCommand.php
index feb21ec60..3636c778d 100644
--- a/app/Console/Commands/UpgradeCommand.php
+++ b/app/Console/Commands/UpgradeCommand.php
@@ -57,7 +57,7 @@ class UpgradeCommand extends Command
                 $userDetails = posix_getpwuid(fileowner('public'));
                 $user = $userDetails['name'] ?? 'www-data';
 
-                if (!$this->confirm("Your webserver user has been detected as [{$user}]: is this correct?", true)) {
+                if (!$this->confirm("Your webserver user has been detected as <fg=blue>[{$user}]:</> is this correct?", true)) {
                     $user = $this->anticipate(
                         'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
                         [
@@ -73,7 +73,7 @@ class UpgradeCommand extends Command
                 $groupDetails = posix_getgrgid(filegroup('public'));
                 $group = $groupDetails['name'] ?? 'www-data';
 
-                if (!$this->confirm("Your webserver group has been detected as [{$group}]: is this correct?", true)) {
+                if (!$this->confirm("Your webserver group has been detected as <fg=blue>[{$group}]:</> is this correct?", true)) {
                     $group = $this->anticipate(
                         'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
                         [
@@ -86,11 +86,13 @@ class UpgradeCommand extends Command
             }
 
             if (!$this->confirm('Are you sure you want to run the upgrade process for your Panel?')) {
+                $this->warn('Upgrade process terminated by user.');
+
                 return;
             }
         }
 
-        ini_set('output_buffering', 0);
+        ini_set('output_buffering', '0');
         $bar = $this->output->createProgressBar($skipDownload ? 9 : 10);
         $bar->start();
 
@@ -173,8 +175,8 @@ class UpgradeCommand extends Command
             $this->call('up');
         });
 
-        $this->newLine();
-        $this->info('Finished running upgrade.');
+        $this->newLine(2);
+        $this->info('Panel has been successfully upgraded. Please ensure you also update any Wings instances: https://pterodactyl.io/wings/1.0/upgrading.html');
     }
 
     protected function withProgress(ProgressBar $bar, Closure $callback)
diff --git a/app/Console/Commands/User/DeleteUserCommand.php b/app/Console/Commands/User/DeleteUserCommand.php
index 4c847257e..57916da13 100644
--- a/app/Console/Commands/User/DeleteUserCommand.php
+++ b/app/Console/Commands/User/DeleteUserCommand.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\User;
 
@@ -47,11 +40,9 @@ class DeleteUserCommand extends Command
     }
 
     /**
-     * @return bool
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      */
-    public function handle()
+    public function handle(): int
     {
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
         Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
@@ -68,13 +59,13 @@ class DeleteUserCommand extends Command
                 return $this->handle();
             }
 
-            return false;
+            return 1;
         }
 
         if ($this->input->isInteractive()) {
             $tableValues = [];
             foreach ($results as $user) {
-                $tableValues[] = [$user->id, $user->email, $user->name];
+                $tableValues[] = [$user->id, $user->email, $user->name_first];
             }
 
             $this->table(['User ID', 'Email', 'Name'], $tableValues);
@@ -85,7 +76,7 @@ class DeleteUserCommand extends Command
             if (count($results) > 1) {
                 $this->error(trans('command/messages.user.multiple_found'));
 
-                return false;
+                return 1;
             }
 
             $deleteUser = $results->first();
@@ -95,5 +86,7 @@ class DeleteUserCommand extends Command
             $this->deletionService->handle($deleteUser);
             $this->info(trans('command/messages.user.deleted'));
         }
+
+        return 0;
     }
 }
diff --git a/app/Console/Commands/User/MakeUserCommand.php b/app/Console/Commands/User/MakeUserCommand.php
index a3fefd965..73a2e0fa4 100644
--- a/app/Console/Commands/User/MakeUserCommand.php
+++ b/app/Console/Commands/User/MakeUserCommand.php
@@ -62,7 +62,7 @@ class MakeUserCommand extends Command
             ['UUID', $user->uuid],
             ['Email', $user->email],
             ['Username', $user->username],
-            ['Name', $user->name],
+            ['Name', $user->name_first],
             ['Admin', $user->root_admin ? 'Yes' : 'No'],
         ]);
     }
diff --git a/app/Contracts/Repository/DatabaseRepositoryInterface.php b/app/Contracts/Repository/DatabaseRepositoryInterface.php
index 622072203..4a1d0eb9f 100644
--- a/app/Contracts/Repository/DatabaseRepositoryInterface.php
+++ b/app/Contracts/Repository/DatabaseRepositoryInterface.php
@@ -39,10 +39,8 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Create a new database user on a given connection.
-     *
-     * @param $max_connections
      */
-    public function createUser(string $username, string $remote, string $password, string $max_connections): bool;
+    public function createUser(string $username, string $remote, string $password, int $max_connections): bool;
 
     /**
      * Give a specific user access to a given database.
@@ -61,8 +59,6 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Drop a given user on a specific connection.
-     *
-     * @return mixed
      */
     public function dropUser(string $username, string $remote): bool;
 }
diff --git a/app/Contracts/Repository/LocationRepositoryInterface.php b/app/Contracts/Repository/LocationRepositoryInterface.php
index d24cee5bd..4a1b4ab12 100644
--- a/app/Contracts/Repository/LocationRepositoryInterface.php
+++ b/app/Contracts/Repository/LocationRepositoryInterface.php
@@ -20,8 +20,6 @@ interface LocationRepositoryInterface extends RepositoryInterface
     /**
      * Return all of the nodes and their respective count of servers for a location.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithNodes(int $id): Location;
@@ -29,8 +27,6 @@ interface LocationRepositoryInterface extends RepositoryInterface
     /**
      * Return a location and the count of nodes in that location.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithNodeCount(int $id): Location;
diff --git a/app/Contracts/Repository/NestRepositoryInterface.php b/app/Contracts/Repository/NestRepositoryInterface.php
index 1f430dbf8..8556200d7 100644
--- a/app/Contracts/Repository/NestRepositoryInterface.php
+++ b/app/Contracts/Repository/NestRepositoryInterface.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository;
 
@@ -16,27 +9,7 @@ interface NestRepositoryInterface extends RepositoryInterface
     /**
      * Return a nest or all nests with their associated eggs and variables.
      *
-     * @param int $id
-     *
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithEggs(int $id = null);
-
-    /**
-     * Return a nest or all nests and the count of eggs and servers for that nest.
-     *
-     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getWithCounts(int $id = null);
-
-    /**
-     * Return a nest along with its associated eggs and the servers relation on those eggs.
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getWithEggServers(int $id): Nest;
+    public function getWithEggs(int $id = null): Nest;
 }
diff --git a/app/Extensions/Spatie/Fractalistic/Fractal.php b/app/Extensions/Spatie/Fractalistic/Fractal.php
index adb3c96a9..e2e6d2442 100644
--- a/app/Extensions/Spatie/Fractalistic/Fractal.php
+++ b/app/Extensions/Spatie/Fractalistic/Fractal.php
@@ -21,20 +21,20 @@ class Fractal extends SpatieFractal
     public function createData()
     {
         // Set the serializer by default.
-        if (is_null($this->serializer)) {
+        if (is_null($this->serializer)) { // @phpstan-ignore-line
             $this->serializer = new PterodactylSerializer();
         }
 
         // Automatically set the paginator on the response object if the
         // data being provided implements a paginator.
-        if (is_null($this->paginator) && $this->data instanceof LengthAwarePaginator) {
+        if (is_null($this->paginator) && $this->data instanceof LengthAwarePaginator) { // @phpstan-ignore-line
             $this->paginator = new IlluminatePaginatorAdapter($this->data);
         }
 
         // If the resource name is not set attempt to pull it off the transformer
         // itself and set it automatically.
         $class = is_string($this->transformer) ? new $this->transformer() : $this->transformer;
-        if (is_null($this->resourceName) && $class instanceof Transformer) {
+        if (is_null($this->resourceName) && $class instanceof Transformer) { // @phpstan-ignore-line
             $this->resourceName = $class->getResourceName();
         }
 
diff --git a/app/Helpers/Time.php b/app/Helpers/Time.php
index fd9a265a3..e8e585c2b 100644
--- a/app/Helpers/Time.php
+++ b/app/Helpers/Time.php
@@ -17,6 +17,6 @@ final class Time
     {
         $offset = round(CarbonImmutable::now($timezone)->getTimezone()->getOffset(CarbonImmutable::now('UTC')) / 3600);
 
-        return sprintf('%s%s:00', $offset > 0 ? '+' : '-', str_pad(abs($offset), 2, '0', STR_PAD_LEFT));
+        return sprintf('%s%s:00', $offset > 0 ? '+' : '-', str_pad((string) abs($offset), 2, '0', STR_PAD_LEFT));
     }
 }
diff --git a/app/Http/Controllers/Api/Application/Databases/DatabaseController.php b/app/Http/Controllers/Api/Application/Databases/DatabaseController.php
index 3398572a3..31a90bafc 100644
--- a/app/Http/Controllers/Api/Application/Databases/DatabaseController.php
+++ b/app/Http/Controllers/Api/Application/Databases/DatabaseController.php
@@ -40,7 +40,7 @@ class DatabaseController extends ApplicationApiController
      */
     public function index(GetDatabasesRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Eggs/EggController.php b/app/Http/Controllers/Api/Application/Eggs/EggController.php
index 113ab26a2..4f1b9700c 100644
--- a/app/Http/Controllers/Api/Application/Eggs/EggController.php
+++ b/app/Http/Controllers/Api/Application/Eggs/EggController.php
@@ -2,11 +2,13 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Application\Eggs;
 
+use Ramsey\Uuid\Uuid;
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\Nest;
 use Illuminate\Http\Response;
 use Illuminate\Http\JsonResponse;
 use Spatie\QueryBuilder\QueryBuilder;
+use Pterodactyl\Services\Eggs\Sharing\EggExporterService;
 use Pterodactyl\Transformers\Api\Application\EggTransformer;
 use Pterodactyl\Http\Requests\Api\Application\Eggs\GetEggRequest;
 use Pterodactyl\Exceptions\Http\QueryValueOutOfRangeHttpException;
@@ -14,20 +16,31 @@ use Pterodactyl\Http\Requests\Api\Application\Eggs\GetEggsRequest;
 use Pterodactyl\Http\Requests\Api\Application\Eggs\StoreEggRequest;
 use Pterodactyl\Http\Requests\Api\Application\Eggs\DeleteEggRequest;
 use Pterodactyl\Http\Requests\Api\Application\Eggs\UpdateEggRequest;
+use Pterodactyl\Http\Requests\Api\Application\Eggs\ExportEggRequest;
 use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
 
 class EggController extends ApplicationApiController
 {
+    private EggExporterService $eggExporterService;
+
+    public function __construct(EggExporterService $eggExporterService)
+    {
+        parent::__construct();
+
+        $this->eggExporterService = $eggExporterService;
+    }
+
     /**
      * Return an array of all eggs on a given nest.
      */
     public function index(GetEggsRequest $request, Nest $nest): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
 
+        // @phpstan-ignore-next-line
         $eggs = QueryBuilder::for(Egg::query())
             ->where('nest_id', '=', $nest->id)
             ->allowedFilters(['id', 'name', 'author'])
@@ -56,11 +69,18 @@ class EggController extends ApplicationApiController
      */
     public function store(StoreEggRequest $request): JsonResponse
     {
-        $egg = Egg::query()->create($request->validated());
+        $validated = $request->validated();
+        $merged = array_merge($validated, [
+            'uuid' => Uuid::uuid4()->toString(),
+            // TODO: allow this to be set in the request, and default to config value if null or not present.
+            'author' => config('pterodactyl.service.author'),
+        ]);
+
+        $egg = Egg::query()->create($merged);
 
         return $this->fractal->item($egg)
             ->transformWith(EggTransformer::class)
-            ->respond(JsonResponse::HTTP_CREATED);
+            ->respond(Response::HTTP_CREATED);
     }
 
     /**
@@ -86,4 +106,14 @@ class EggController extends ApplicationApiController
 
         return $this->returnNoContent();
     }
+
+    /**
+     * Exports an egg.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function export(ExportEggRequest $request, int $eggId): JsonResponse
+    {
+        return new JsonResponse($this->eggExporterService->handle($eggId));
+    }
 }
diff --git a/app/Http/Controllers/Api/Application/Eggs/EggVariableController.php b/app/Http/Controllers/Api/Application/Eggs/EggVariableController.php
new file mode 100644
index 000000000..c67089a48
--- /dev/null
+++ b/app/Http/Controllers/Api/Application/Eggs/EggVariableController.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Pterodactyl\Http\Controllers\Api\Application\Eggs;
+
+use Pterodactyl\Models\Egg;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Pterodactyl\Models\EggVariable;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Services\Eggs\Variables\VariableUpdateService;
+use Pterodactyl\Services\Eggs\Variables\VariableCreationService;
+use Pterodactyl\Transformers\Api\Application\EggVariableTransformer;
+use Pterodactyl\Http\Controllers\Api\Application\ApplicationApiController;
+use Pterodactyl\Http\Requests\Api\Application\Eggs\Variables\StoreEggVariableRequest;
+use Pterodactyl\Http\Requests\Api\Application\Eggs\Variables\UpdateEggVariablesRequest;
+
+class EggVariableController extends ApplicationApiController
+{
+    private ConnectionInterface $connection;
+
+    private VariableCreationService $variableCreationService;
+
+    private VariableUpdateService $variableUpdateService;
+
+    public function __construct(ConnectionInterface $connection, VariableCreationService $variableCreationService, VariableUpdateService $variableUpdateService)
+    {
+        parent::__construct();
+
+        $this->connection = $connection;
+        $this->variableCreationService = $variableCreationService;
+        $this->variableUpdateService = $variableUpdateService;
+    }
+
+    /**
+     * Creates a new egg variable.
+     *
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
+     * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
+     */
+    public function store(StoreEggVariableRequest $request, Egg $egg): array
+    {
+        $variable = $this->variableCreationService->handle($egg->id, $request->validated());
+
+        return $this->fractal->item($variable)
+            ->transformWith(EggVariableTransformer::class)
+            ->toArray();
+    }
+
+    /**
+     * Updates multiple egg variables.
+     *
+     * @throws \Throwable
+     */
+    public function update(UpdateEggVariablesRequest $request, Egg $egg): array
+    {
+        $validated = $request->validated();
+
+        $this->connection->transaction(function () use ($egg, $validated) {
+            foreach ($validated as $data) {
+                $this->variableUpdateService->handle($egg, $data);
+            }
+        });
+
+        return $this->fractal->collection($egg->refresh()->variables)
+            ->transformWith(EggVariableTransformer::class)
+            ->toArray();
+    }
+
+    /**
+     * Deletes a single egg variable.
+     */
+    public function delete(Request $request, Egg $egg, EggVariable $eggVariable): Response
+    {
+        EggVariable::query()
+            ->where('id', $eggVariable->id)
+            ->where('egg_id', $egg->id)
+            ->delete();
+
+        return $this->returnNoContent();
+    }
+}
diff --git a/app/Http/Controllers/Api/Application/Locations/LocationController.php b/app/Http/Controllers/Api/Application/Locations/LocationController.php
index a3a4af6e7..e7b7b7a38 100644
--- a/app/Http/Controllers/Api/Application/Locations/LocationController.php
+++ b/app/Http/Controllers/Api/Application/Locations/LocationController.php
@@ -46,7 +46,7 @@ class LocationController extends ApplicationApiController
      */
     public function index(GetLocationsRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Mounts/MountController.php b/app/Http/Controllers/Api/Application/Mounts/MountController.php
index 9a5ddfc1b..6fb6e6d16 100644
--- a/app/Http/Controllers/Api/Application/Mounts/MountController.php
+++ b/app/Http/Controllers/Api/Application/Mounts/MountController.php
@@ -34,7 +34,7 @@ class MountController extends ApplicationApiController
      */
     public function index(GetMountsRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Nests/NestController.php b/app/Http/Controllers/Api/Application/Nests/NestController.php
index 8f2b68905..34e42804c 100644
--- a/app/Http/Controllers/Api/Application/Nests/NestController.php
+++ b/app/Http/Controllers/Api/Application/Nests/NestController.php
@@ -13,8 +13,8 @@ use Pterodactyl\Transformers\Api\Application\EggTransformer;
 use Pterodactyl\Transformers\Api\Application\NestTransformer;
 use Pterodactyl\Exceptions\Http\QueryValueOutOfRangeHttpException;
 use Pterodactyl\Http\Requests\Api\Application\Nests\GetNestRequest;
-use Pterodactyl\Http\Requests\Api\Application\Nests\GetNestsRequest;
 use Pterodactyl\Http\Requests\Api\Application\Eggs\ImportEggRequest;
+use Pterodactyl\Http\Requests\Api\Application\Nests\GetNestsRequest;
 use Pterodactyl\Http\Requests\Api\Application\Nests\StoreNestRequest;
 use Pterodactyl\Http\Requests\Api\Application\Nests\DeleteNestRequest;
 use Pterodactyl\Http\Requests\Api\Application\Nests\UpdateNestRequest;
@@ -51,7 +51,7 @@ class NestController extends ApplicationApiController
      */
     public function index(GetNestsRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
index 9845a4c62..8f0455c21 100644
--- a/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/AllocationController.php
@@ -42,7 +42,7 @@ class AllocationController extends ApplicationApiController
      */
     public function index(GetAllocationsRequest $request, Node $node): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeController.php b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
index c9cfbb857..5d9dc5b91 100644
--- a/app/Http/Controllers/Api/Application/Nodes/NodeController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/NodeController.php
@@ -50,7 +50,7 @@ class NodeController extends ApplicationApiController
      */
     public function index(GetNodesRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php b/app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php
index cebf5a8a0..9633bc8fe 100644
--- a/app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php
+++ b/app/Http/Controllers/Api/Application/Nodes/NodeDeploymentController.php
@@ -35,7 +35,7 @@ class NodeDeploymentController extends ApplicationApiController
         $nodes = $this->viableNodesService->setLocations($data['location_ids'] ?? [])
             ->setMemory($data['memory'])
             ->setDisk($data['disk'])
-            ->handle($request->query('per_page'), $request->query('page'));
+            ->handle($request->query('per_page'), $request->query('page')); // @phpstan-ignore-line
 
         return $this->fractal->collection($nodes)
             ->transformWith(NodeTransformer::class)
diff --git a/app/Http/Controllers/Api/Application/Roles/RoleController.php b/app/Http/Controllers/Api/Application/Roles/RoleController.php
index aab08f276..253e070fe 100644
--- a/app/Http/Controllers/Api/Application/Roles/RoleController.php
+++ b/app/Http/Controllers/Api/Application/Roles/RoleController.php
@@ -32,7 +32,7 @@ class RoleController extends ApplicationApiController
      */
     public function index(GetRolesRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Application/Servers/ServerController.php b/app/Http/Controllers/Api/Application/Servers/ServerController.php
index 40436fb7e..93260f321 100644
--- a/app/Http/Controllers/Api/Application/Servers/ServerController.php
+++ b/app/Http/Controllers/Api/Application/Servers/ServerController.php
@@ -52,7 +52,7 @@ class ServerController extends ApplicationApiController
      */
     public function index(GetServersRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
@@ -79,7 +79,7 @@ class ServerController extends ApplicationApiController
      */
     public function store(StoreServerRequest $request): JsonResponse
     {
-        $server = $this->creationService->handle($request->validated(), $request->getDeploymentObject());
+        $server = $this->creationService->handle($request->validated());
 
         return $this->fractal->item($server)
             ->transformWith(ServerTransformer::class)
diff --git a/app/Http/Controllers/Api/Application/Users/UserController.php b/app/Http/Controllers/Api/Application/Users/UserController.php
index 8cb40cc88..44e765d4c 100644
--- a/app/Http/Controllers/Api/Application/Users/UserController.php
+++ b/app/Http/Controllers/Api/Application/Users/UserController.php
@@ -52,7 +52,7 @@ class UserController extends ApplicationApiController
      */
     public function index(GetUsersRequest $request): array
     {
-        $perPage = $request->query('per_page', 10);
+        $perPage = (int) $request->query('per_page', '10');
         if ($perPage < 1 || $perPage > 100) {
             throw new QueryValueOutOfRangeHttpException('per_page', 1, 100);
         }
diff --git a/app/Http/Controllers/Api/Client/AccountController.php b/app/Http/Controllers/Api/Client/AccountController.php
index 84b789c95..4a2873f79 100644
--- a/app/Http/Controllers/Api/Client/AccountController.php
+++ b/app/Http/Controllers/Api/Client/AccountController.php
@@ -4,7 +4,7 @@ namespace Pterodactyl\Http\Controllers\Api\Client;
 
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Auth\SessionGuard;
+use Illuminate\Auth\AuthManager;
 use Pterodactyl\Services\Users\UserUpdateService;
 use Pterodactyl\Transformers\Api\Client\AccountTransformer;
 use Pterodactyl\Http\Requests\Api\Client\Account\UpdateEmailRequest;
@@ -12,24 +12,26 @@ use Pterodactyl\Http\Requests\Api\Client\Account\UpdatePasswordRequest;
 
 class AccountController extends ClientApiController
 {
-    private SessionGuard $sessionGuard;
     private UserUpdateService $updateService;
 
+    /**
+     * @var \Illuminate\Auth\AuthManager
+     */
+    private $sessionGuard;
+
     /**
      * AccountController constructor.
      */
-    public function __construct(SessionGuard $sessionGuard, UserUpdateService $updateService)
+    public function __construct(UserUpdateService $updateService, AuthManager $sessionGuard)
     {
         parent::__construct();
 
-        $this->sessionGuard = $sessionGuard;
         $this->updateService = $updateService;
+        $this->sessionGuard = $sessionGuard;
     }
 
     /**
      * Gets information about the currently authenticated user.
-     *
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function index(Request $request): array
     {
@@ -40,9 +42,6 @@ class AccountController extends ClientApiController
 
     /**
      * Update the authenticated user's email address.
-     *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function updateEmail(UpdateEmailRequest $request): Response
     {
@@ -65,9 +64,12 @@ class AccountController extends ClientApiController
         // cached copy of the user that does not include the updated password. Do this
         // to correctly store the new user details in the guard and allow the logout
         // other devices functionality to work.
-        $this->sessionGuard->setUser($user);
+        if (method_exists($this->sessionGuard, 'setUser')) {
+            $this->sessionGuard->setUser($user);
+        }
 
-        $this->sessionGuard->logoutOtherDevices($request->input('password'));
+        // TODO: Find another way to do this, function doesn't exist due to API changes.
+        //$this->sessionGuard->logoutOtherDevices($request->input('password'));
 
         return $this->returnNoContent();
     }
diff --git a/app/Http/Controllers/Api/Client/ClientController.php b/app/Http/Controllers/Api/Client/ClientController.php
index 67b15555d..caf99e2f1 100644
--- a/app/Http/Controllers/Api/Client/ClientController.php
+++ b/app/Http/Controllers/Api/Client/ClientController.php
@@ -66,7 +66,7 @@ class ClientController extends ClientApiController
             $builder = $builder->whereIn('servers.id', $user->accessibleServers()->pluck('id')->all());
         }
 
-        $servers = $builder->paginate(min($request->query('per_page', 50), 100))->appends($request->query());
+        $servers = $builder->paginate(min((int) $request->query('per_page', '50'), 100))->appends($request->query());
 
         return $this->fractal->transformWith(new ServerTransformer())->collection($servers)->toArray();
     }
diff --git a/app/Http/Controllers/Api/Client/Servers/StartupController.php b/app/Http/Controllers/Api/Client/Servers/StartupController.php
index 856bae29d..f9328264d 100644
--- a/app/Http/Controllers/Api/Client/Servers/StartupController.php
+++ b/app/Http/Controllers/Api/Client/Servers/StartupController.php
@@ -61,7 +61,6 @@ class StartupController extends ClientApiController
      */
     public function update(UpdateStartupVariableRequest $request, Server $server): array
     {
-        /** @var \Pterodactyl\Models\EggVariable $variable */
         $variable = $server->variables()->where('env_variable', $request->input('key'))->first();
 
         if (is_null($variable) || !$variable->user_viewable) {
diff --git a/app/Http/Controllers/Auth/AbstractLoginController.php b/app/Http/Controllers/Auth/AbstractLoginController.php
index b490d6036..7a12ad665 100644
--- a/app/Http/Controllers/Auth/AbstractLoginController.php
+++ b/app/Http/Controllers/Auth/AbstractLoginController.php
@@ -7,7 +7,7 @@ use Pterodactyl\Models\User;
 use Illuminate\Auth\AuthManager;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Auth\Events\Failed;
-use Illuminate\Contracts\Config\Repository;
+use Illuminate\Container\Container;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -17,6 +17,8 @@ abstract class AbstractLoginController extends Controller
 {
     use AuthenticatesUsers;
 
+    protected AuthManager $auth;
+
     /**
      * Lockout time for failed login requests.
      *
@@ -38,26 +40,14 @@ abstract class AbstractLoginController extends Controller
      */
     protected $redirectTo = '/';
 
-    /**
-     * @var \Illuminate\Auth\AuthManager
-     */
-    protected $auth;
-
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
     /**
      * LoginController constructor.
      */
-    public function __construct(AuthManager $auth, Repository $config)
+    public function __construct()
     {
-        $this->lockoutTime = $config->get('auth.lockout.time');
-        $this->maxLoginAttempts = $config->get('auth.lockout.attempts');
-
-        $this->auth = $auth;
-        $this->config = $config;
+        $this->lockoutTime = config('auth.lockout.time');
+        $this->maxLoginAttempts = config('auth.lockout.attempts');
+        $this->auth = Container::getInstance()->make(AuthManager::class);
     }
 
     /**
@@ -72,7 +62,7 @@ abstract class AbstractLoginController extends Controller
             $this->getField($request->input('user')) => $request->input('user'),
         ]);
 
-        if ($request->route()->named('auth.login-checkpoint')) {
+        if ($request->route()->named('auth.checkpoint') || $request->route()->named('auth.checkpoint.key')) {
             throw new DisplayException($message ?? trans('auth.two_factor.checkpoint_failed'));
         }
 
@@ -84,7 +74,9 @@ abstract class AbstractLoginController extends Controller
      */
     protected function sendLoginResponse(User $user, Request $request): JsonResponse
     {
+        $request->session()->remove('auth_confirmation_token');
         $request->session()->regenerate();
+
         $this->clearLoginAttempts($request);
 
         $this->auth->guard()->login($user, true);
@@ -99,8 +91,6 @@ abstract class AbstractLoginController extends Controller
 
     /**
      * Determine if the user is logging in using an email or username,.
-     *
-     * @param string $input
      */
     protected function getField(string $input = null): string
     {
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 7b409e519..bb272f58f 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -16,7 +16,6 @@ class ForgotPasswordController extends Controller
     /**
      * Get the response for a failed password reset link.
      *
-     * @param \Illuminate\Http\Request
      * @param string $response
      */
     protected function sendResetLinkFailedResponse(Request $request, $response): JsonResponse
diff --git a/app/Http/Controllers/Auth/LoginCheckpointController.php b/app/Http/Controllers/Auth/LoginCheckpointController.php
index d38f31230..865377b7b 100644
--- a/app/Http/Controllers/Auth/LoginCheckpointController.php
+++ b/app/Http/Controllers/Auth/LoginCheckpointController.php
@@ -2,36 +2,35 @@
 
 namespace Pterodactyl\Http\Controllers\Auth;
 
+use Carbon\CarbonImmutable;
+use Carbon\CarbonInterface;
 use Pterodactyl\Models\User;
-use Illuminate\Auth\AuthManager;
 use PragmaRX\Google2FA\Google2FA;
-use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Pterodactyl\Http\Requests\Auth\LoginCheckpointRequest;
-use Illuminate\Contracts\Cache\Repository as CacheRepository;
+use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 
 class LoginCheckpointController extends AbstractLoginController
 {
-    private CacheRepository $cache;
+    public const TOKEN_EXPIRED_MESSAGE = 'The authentication token provided has expired, please refresh the page and try again.';
+
     private Encrypter $encrypter;
+
     private Google2FA $google2FA;
 
+    private ValidationFactory $validation;
+
     /**
      * LoginCheckpointController constructor.
      */
-    public function __construct(
-        AuthManager $auth,
-        Repository $config,
-        CacheRepository $cache,
-        Encrypter $encrypter,
-        Google2FA $google2FA
-    ) {
-        parent::__construct($auth, $config);
+    public function __construct(Encrypter $encrypter, Google2FA $google2FA, ValidationFactory $validation)
+    {
+        parent::__construct();
 
-        $this->cache = $cache;
         $this->encrypter = $encrypter;
         $this->google2FA = $google2FA;
+        $this->validation = $validation;
     }
 
     /**
@@ -45,6 +44,7 @@ class LoginCheckpointController extends AbstractLoginController
      * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
      * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
      * @throws \Illuminate\Validation\ValidationException
+     * @throws \Pterodactyl\Exceptions\DisplayException
      */
     public function __invoke(LoginCheckpointRequest $request)
     {
@@ -54,18 +54,24 @@ class LoginCheckpointController extends AbstractLoginController
             return;
         }
 
-        $token = $request->input('confirmation_token');
+        $details = $request->session()->get('auth_confirmation_token');
+        if (!$this->hasValidSessionData($details)) {
+            $this->sendFailedLoginResponse($request, null, self::TOKEN_EXPIRED_MESSAGE);
+
+            return;
+        }
+
+        if (!hash_equals($request->input('confirmation_token') ?? '', $details['token_value'])) {
+            $this->sendFailedLoginResponse($request);
+
+            return;
+        }
+
         try {
             /** @var \Pterodactyl\Models\User $user */
-            $user = User::query()->findOrFail($this->cache->get($token, 0));
+            $user = User::query()->findOrFail($details['user_id']);
         } catch (ModelNotFoundException $exception) {
-            $this->incrementLoginAttempts($request);
-
-            $this->sendFailedLoginResponse(
-                $request,
-                null,
-                'The authentication token provided has expired, please refresh the page and try again.'
-            );
+            $this->sendFailedLoginResponse($request, null, self::TOKEN_EXPIRED_MESSAGE);
 
             return;
         }
@@ -79,25 +85,18 @@ class LoginCheckpointController extends AbstractLoginController
             $decrypted = $this->encrypter->decrypt($user->totp_secret);
 
             if ($this->google2FA->verifyKey($decrypted, (string) $request->input('authentication_code') ?? '', config('pterodactyl.auth.2fa.window'))) {
-                $this->cache->delete($token);
-
                 return $this->sendLoginResponse($user, $request);
             }
         }
 
-        $this->incrementLoginAttempts($request);
         $this->sendFailedLoginResponse($request, $user, !empty($recoveryToken) ? 'The recovery token provided is not valid.' : null);
     }
 
     /**
      * Determines if a given recovery token is valid for the user account. If we find a matching token
      * it will be deleted from the database.
-     *
-     * @return bool
-     *
-     * @throws \Exception
      */
-    protected function isValidRecoveryToken(User $user, string $value)
+    protected function isValidRecoveryToken(User $user, string $value): bool
     {
         foreach ($user->recoveryTokens as $token) {
             if (password_verify($value, $token->token)) {
@@ -109,4 +108,37 @@ class LoginCheckpointController extends AbstractLoginController
 
         return false;
     }
+
+    protected function hasValidSessionData(array $data): bool
+    {
+        return static::isValidSessionData($this->validation, $data);
+    }
+
+    /**
+     * Determines if the data provided from the session is valid or not. This
+     * will return false if the data is invalid, or if more time has passed than
+     * was configured when the session was written.
+     */
+    public static function isValidSessionData(ValidationFactory $validation, array $data): bool
+    {
+        $validator = $validation->make($data, [
+            'user_id' => 'required|integer|min:1',
+            'token_value' => 'required|string',
+            'expires_at' => 'required',
+        ]);
+
+        if ($validator->fails()) {
+            return false;
+        }
+
+        if (!$data['expires_at'] instanceof CarbonInterface) {
+            return false;
+        }
+
+        if ($data['expires_at']->isBefore(CarbonImmutable::now())) {
+            return false;
+        }
+
+        return true;
+    }
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 7df497865..4ed326623 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -5,14 +5,11 @@ namespace Pterodactyl\Http\Controllers\Auth;
 use Carbon\CarbonImmutable;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
-use Illuminate\Auth\AuthManager;
+use Pterodactyl\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Contracts\View\View;
-use Illuminate\Contracts\Config\Repository;
+use LaravelWebauthn\Facades\Webauthn;
 use Illuminate\Contracts\View\Factory as ViewFactory;
-use Illuminate\Contracts\Cache\Repository as CacheRepository;
-use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
-use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 
 class LoginController extends AbstractLoginController
 {
@@ -21,31 +18,22 @@ class LoginController extends AbstractLoginController
     private const METHOD_TOTP = 'totp';
     private const METHOD_WEBAUTHN = 'webauthn';
 
-    private CacheRepository $cache;
-    private UserRepositoryInterface $repository;
     private ViewFactory $view;
 
     /**
      * LoginController constructor.
      */
-    public function __construct(
-        AuthManager $auth,
-        Repository $config,
-        CacheRepository $cache,
-        UserRepositoryInterface $repository,
-        ViewFactory $view
-    ) {
-        parent::__construct($auth, $config);
+    public function __construct(ViewFactory $view)
+    {
+        parent::__construct();
 
-        $this->cache = $cache;
-        $this->repository = $repository;
         $this->view = $view;
     }
 
     /**
      * Handle all incoming requests for the authentication routes and render the
-     * base authentication view component.  React will take over at this point and
-     * turn the login area into a SPA.
+     * base authentication view component. React will take over at this point and
+     * turn the login area into an SPA.
      */
     public function index(): View
     {
@@ -62,9 +50,6 @@ class LoginController extends AbstractLoginController
      */
     public function login(Request $request)
     {
-        $username = $request->input('user');
-        $useColumn = $this->getField($username);
-
         if ($this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
             $this->sendLockoutResponse($request);
@@ -72,13 +57,12 @@ class LoginController extends AbstractLoginController
             return;
         }
 
-        try {
-            /** @var \Pterodactyl\Models\User $user */
-            $user = $this->repository->findFirstWhere([[$useColumn, '=', $username]]);
-        } catch (RecordNotFoundException $exception) {
-            $this->sendFailedLoginResponse($request);
+        $username = $request->input('user');
 
-            return;
+        /** @var \Pterodactyl\Models\User|null $user */
+        $user = User::query()->where($this->getField($username), $username)->first();
+        if (is_null($user)) {
+            $this->sendFailedLoginResponse($request);
         }
 
         // Ensure that the account is using a valid username and password before trying to
@@ -91,17 +75,44 @@ class LoginController extends AbstractLoginController
             return;
         }
 
-        if ($user->use_totp) {
-            $token = Str::random(64);
-            $this->cache->put($token, $user->id, CarbonImmutable::now()->addMinutes(5));
+        $useTotp = $user->use_totp;
+        $webauthnKeys = $user->webauthnKeys()->get();
 
-            return new JsonResponse([
-                'complete' => false,
-                'methods' => [self::METHOD_TOTP],
-                'confirmation_token' => $token,
-            ]);
+        if (!$useTotp && count($webauthnKeys) < 1) {
+            return $this->sendLoginResponse($user, $request);
         }
 
-        return $this->sendLoginResponse($user, $request);
+        $methods = [];
+        if ($useTotp) {
+            $methods[] = self::METHOD_TOTP;
+        }
+        if (count($webauthnKeys) > 0) {
+            $methods[] = self::METHOD_WEBAUTHN;
+        }
+
+        $token = Str::random(64);
+
+        $request->session()->put('auth_confirmation_token', [
+            'user_id' => $user->id,
+            'token_value' => $token,
+            'expires_at' => CarbonImmutable::now()->addMinutes(5),
+        ]);
+
+        $response = [
+            'complete' => false,
+            'methods' => $methods,
+            'confirmation_token' => $token,
+        ];
+
+        if (count($webauthnKeys) > 0) {
+            $publicKey = Webauthn::getAuthenticateData($user);
+            $request->session()->put(self::SESSION_PUBLICKEY_REQUEST, $publicKey);
+
+            $response['webauthn'] = [
+                'public_key' => $publicKey,
+            ];
+        }
+
+        return new JsonResponse($response);
     }
 }
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index 1107510a8..d074c0353 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -87,7 +87,7 @@ class ResetPasswordController extends Controller
      * account do not automatically log them in. In those cases, send the user back to the login
      * form with a note telling them their password was changed and to log back in.
      *
-     * @param \Illuminate\Contracts\Auth\CanResetPassword|\Pterodactyl\Models\User $user
+     * @param \Pterodactyl\Models\User $user
      * @param string $password
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
diff --git a/app/Http/Middleware/Api/Application/SubstituteApplicationApiBindings.php b/app/Http/Middleware/Api/Application/SubstituteApplicationApiBindings.php
index 4ae63ff4a..e629f6ca6 100644
--- a/app/Http/Middleware/Api/Application/SubstituteApplicationApiBindings.php
+++ b/app/Http/Middleware/Api/Application/SubstituteApplicationApiBindings.php
@@ -54,7 +54,7 @@ class SubstituteApplicationApiBindings
         try {
             $this->router->substituteImplicitBindings($route = $request->route());
         } catch (ModelNotFoundException $exception) {
-            if (isset($route) && $route->getMissing()) {
+            if (!empty($route) && $route->getMissing()) {
                 $route->getMissing()($request);
             }
 
diff --git a/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php b/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php
index 3a1a80f49..954f1e0f5 100644
--- a/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php
+++ b/app/Http/Middleware/Api/Client/SubstituteClientApiBindings.php
@@ -25,7 +25,7 @@ class SubstituteClientApiBindings
     /**
      * Perform substitution of route parameters for the Client API.
      *
-     * @param \Illuminate\Http\Request
+     * @param \Illuminate\Http\Request $request
      *
      * @return mixed
      */
@@ -76,7 +76,7 @@ class SubstituteClientApiBindings
             /* @var \Illuminate\Routing\Route $route */
             $this->router->substituteBindings($route = $request->route());
         } catch (ModelNotFoundException $exception) {
-            if (isset($route) && $route->getMissing()) {
+            if (!empty($route) && $route->getMissing()) {
                 $route->getMissing()($request);
             }
 
diff --git a/app/Http/Middleware/RequireTwoFactorAuthentication.php b/app/Http/Middleware/RequireTwoFactorAuthentication.php
index 724a11eb1..57c4dfc51 100644
--- a/app/Http/Middleware/RequireTwoFactorAuthentication.php
+++ b/app/Http/Middleware/RequireTwoFactorAuthentication.php
@@ -41,7 +41,7 @@ class RequireTwoFactorAuthentication
      */
     public function handle(Request $request, Closure $next)
     {
-        /** @var \Pterodactyl\Models\User $user */
+        /** @var \Pterodactyl\Models\User|null $user */
         $user = $request->user();
         $uri = rtrim($request->getRequestUri(), '/') . '/';
         $current = $request->route()->getName();
@@ -66,6 +66,7 @@ class RequireTwoFactorAuthentication
             throw new TwoFactorAuthRequiredException();
         }
 
+        // @phpstan-ignore-next-line
         $this->alert->danger(trans('auth.2fa_must_be_enabled'))->flash();
 
         return redirect()->to($this->redirectRoute);
diff --git a/app/Http/Requests/Api/Application/Eggs/ExportEggRequest.php b/app/Http/Requests/Api/Application/Eggs/ExportEggRequest.php
new file mode 100644
index 000000000..63893df54
--- /dev/null
+++ b/app/Http/Requests/Api/Application/Eggs/ExportEggRequest.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Application\Eggs;
+
+use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
+
+class ExportEggRequest extends ApplicationApiRequest
+{
+}
diff --git a/app/Http/Requests/Api/Application/Eggs/StoreEggRequest.php b/app/Http/Requests/Api/Application/Eggs/StoreEggRequest.php
index 6759615c9..9c1146909 100644
--- a/app/Http/Requests/Api/Application/Eggs/StoreEggRequest.php
+++ b/app/Http/Requests/Api/Application/Eggs/StoreEggRequest.php
@@ -2,13 +2,29 @@
 
 namespace Pterodactyl\Http\Requests\Api\Application\Eggs;
 
-use Pterodactyl\Models\Egg;
 use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
 
 class StoreEggRequest extends ApplicationApiRequest
 {
     public function rules(array $rules = null): array
     {
-        return $rules ?? Egg::getRules();
+        return [
+            'nest_id' => 'required|bail|numeric|exists:nests,id',
+            'name' => 'required|string|max:191',
+            'description' => 'sometimes|string|nullable',
+            'features' => 'sometimes|array',
+            'docker_images' => 'required|array|min:1',
+            'docker_images.*' => 'required|string',
+            'file_denylist' => 'sometimes|array|nullable',
+            'file_denylist.*' => 'sometimes|string',
+            'config_files' => 'required|nullable|json',
+            'config_startup' => 'required|nullable|json',
+            'config_stop' => 'required|nullable|string|max:191',
+//            'config_from' => 'sometimes|nullable|numeric|exists:eggs,id',
+            'startup' => 'required|string',
+            'script_container' => 'sometimes|string',
+            'script_entry' => 'sometimes|string',
+            'script_install' => 'sometimes|string',
+        ];
     }
 }
diff --git a/app/Http/Requests/Api/Application/Eggs/UpdateEggRequest.php b/app/Http/Requests/Api/Application/Eggs/UpdateEggRequest.php
index 7eb76fa24..090f5b51c 100644
--- a/app/Http/Requests/Api/Application/Eggs/UpdateEggRequest.php
+++ b/app/Http/Requests/Api/Application/Eggs/UpdateEggRequest.php
@@ -10,16 +10,16 @@ class UpdateEggRequest extends StoreEggRequest
             'nest_id' => 'sometimes|numeric|exists:nests,id',
             'name' => 'sometimes|string|max:191',
             'description' => 'sometimes|string|nullable',
-            'features' => 'sometimes|array|nullable',
-            'docker_images' => 'sometimes|required|array|min:1',
+            'features' => 'sometimes|array',
+            'docker_images' => 'sometimes|array|min:1',
             'docker_images.*' => 'sometimes|string',
             'file_denylist' => 'sometimes|array|nullable',
             'file_denylist.*' => 'sometimes|string',
             'config_files' => 'sometimes|nullable|json',
             'config_startup' => 'sometimes|nullable|json',
             'config_stop' => 'sometimes|nullable|string|max:191',
-            'config_from' => 'sometimes|nullable|numeric|exists:eggs,id',
-            'startup' => 'sometimes|nullable|string',
+//            'config_from' => 'sometimes|nullable|numeric|exists:eggs,id',
+            'startup' => 'sometimes|string',
             'script_container' => 'sometimes|string',
             'script_entry' => 'sometimes|string',
             'script_install' => 'sometimes|string',
diff --git a/app/Http/Requests/Api/Application/Eggs/Variables/StoreEggVariableRequest.php b/app/Http/Requests/Api/Application/Eggs/Variables/StoreEggVariableRequest.php
new file mode 100644
index 000000000..9c674a9d8
--- /dev/null
+++ b/app/Http/Requests/Api/Application/Eggs/Variables/StoreEggVariableRequest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Application\Eggs\Variables;
+
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
+
+class StoreEggVariableRequest extends ApplicationApiRequest
+{
+    public function rules(array $rules = null): array
+    {
+        return [
+            'name' => 'required|string|min:1|max:191',
+            'description' => 'sometimes|string|nullable',
+            'env_variable' => 'required|regex:/^[\w]{1,191}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
+            'default_value' => 'present',
+            'user_viewable' => 'required|boolean',
+            'user_editable' => 'required|boolean',
+            'rules' => 'bail|required|string',
+        ];
+    }
+}
diff --git a/app/Http/Requests/Api/Application/Eggs/Variables/UpdateEggVariablesRequest.php b/app/Http/Requests/Api/Application/Eggs/Variables/UpdateEggVariablesRequest.php
new file mode 100644
index 000000000..c15de2ce3
--- /dev/null
+++ b/app/Http/Requests/Api/Application/Eggs/Variables/UpdateEggVariablesRequest.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Pterodactyl\Http\Requests\Api\Application\Eggs\Variables;
+
+use Pterodactyl\Models\EggVariable;
+use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
+
+class UpdateEggVariablesRequest extends ApplicationApiRequest
+{
+    public function rules(array $rules = null): array
+    {
+        return [
+            '*' => 'array',
+            '*.id' => 'required|integer',
+            '*.name' => 'sometimes|string|min:1|max:191',
+            '*.description' => 'sometimes|string|nullable',
+            '*.env_variable' => 'sometimes|regex:/^[\w]{1,191}$/|notIn:' . EggVariable::RESERVED_ENV_NAMES,
+            '*.default_value' => 'sometimes|present',
+            '*.user_viewable' => 'sometimes|boolean',
+            '*.user_editable' => 'sometimes|boolean',
+            '*.rules' => 'sometimes|string',
+        ];
+    }
+}
diff --git a/app/Http/Requests/Api/Application/Servers/StoreServerRequest.php b/app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
index 3e42ab62a..452909abe 100644
--- a/app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
+++ b/app/Http/Requests/Api/Application/Servers/StoreServerRequest.php
@@ -3,9 +3,6 @@
 namespace Pterodactyl\Http\Requests\Api\Application\Servers;
 
 use Pterodactyl\Models\Server;
-use Illuminate\Validation\Rule;
-use Illuminate\Contracts\Validation\Validator;
-use Pterodactyl\Models\Objects\DeploymentObject;
 use Pterodactyl\Http\Requests\Api\Application\ApplicationApiRequest;
 
 class StoreServerRequest extends ApplicationApiRequest
@@ -18,15 +15,9 @@ class StoreServerRequest extends ApplicationApiRequest
             'external_id' => $rules['external_id'],
             'name' => $rules['name'],
             'description' => array_merge(['nullable'], $rules['description']),
-            'user' => $rules['owner_id'],
-            'egg' => $rules['egg_id'],
-            'docker_image' => $rules['image'],
-            'startup' => $rules['startup'],
-            'environment' => 'present|array',
-            'skip_scripts' => 'sometimes|boolean',
-            'oom_disabled' => 'sometimes|boolean',
+            'owner_id' => $rules['owner_id'],
+            'node_id' => $rules['node_id'],
 
-            // Resource limitations
             'limits' => 'required|array',
             'limits.memory' => $rules['memory'],
             'limits.swap' => $rules['swap'],
@@ -34,26 +25,21 @@ class StoreServerRequest extends ApplicationApiRequest
             'limits.io' => $rules['io'],
             'limits.threads' => $rules['threads'],
             'limits.cpu' => $rules['cpu'],
+            'limits.oom_killer' => 'required|boolean',
 
-            // Application Resource Limits
             'feature_limits' => 'required|array',
-            'feature_limits.databases' => $rules['database_limit'],
             'feature_limits.allocations' => $rules['allocation_limit'],
             'feature_limits.backups' => $rules['backup_limit'],
+            'feature_limits.databases' => $rules['database_limit'],
 
-            // Placeholders for rules added in withValidator() function.
-            'allocation.default' => '',
-            'allocation.additional.*' => '',
+            'allocation.default' => 'required|bail|integer|exists:allocations,id',
+            'allocation.additional.*' => 'integer|exists:allocations,id',
 
-            // Automatic deployment rules
-            'deploy' => 'sometimes|required|array',
-            'deploy.locations' => 'array',
-            'deploy.locations.*' => 'integer|min:1',
-            'deploy.dedicated_ip' => 'required_with:deploy,boolean',
-            'deploy.port_range' => 'array',
-            'deploy.port_range.*' => 'string',
-
-            'start_on_completion' => 'sometimes|boolean',
+            'startup' => $rules['startup'],
+            'environment' => 'present|array',
+            'egg_id' => $rules['egg_id'],
+            'image' => $rules['image'],
+            'skip_scripts' => 'present|boolean',
         ];
     }
 
@@ -65,69 +51,30 @@ class StoreServerRequest extends ApplicationApiRequest
             'external_id' => array_get($data, 'external_id'),
             'name' => array_get($data, 'name'),
             'description' => array_get($data, 'description'),
-            'owner_id' => array_get($data, 'user'),
-            'egg_id' => array_get($data, 'egg'),
-            'image' => array_get($data, 'docker_image'),
-            'startup' => array_get($data, 'startup'),
-            'environment' => array_get($data, 'environment'),
+            'owner_id' => array_get($data, 'owner_id'),
+            'node_id' => array_get($data, 'node_id'),
+
             'memory' => array_get($data, 'limits.memory'),
             'swap' => array_get($data, 'limits.swap'),
             'disk' => array_get($data, 'limits.disk'),
             'io' => array_get($data, 'limits.io'),
-            'cpu' => array_get($data, 'limits.cpu'),
             'threads' => array_get($data, 'limits.threads'),
-            'skip_scripts' => array_get($data, 'skip_scripts', false),
-            'allocation_id' => array_get($data, 'allocation.default'),
-            'allocation_additional' => array_get($data, 'allocation.additional'),
-            'start_on_completion' => array_get($data, 'start_on_completion', false),
-            'database_limit' => array_get($data, 'feature_limits.databases'),
+            'cpu' => array_get($data, 'limits.cpu'),
+            'oom_disabled' => !array_get($data, 'limits.oom_killer'),
+
             'allocation_limit' => array_get($data, 'feature_limits.allocations'),
             'backup_limit' => array_get($data, 'feature_limits.backups'),
+            'database_limit' => array_get($data, 'feature_limits.databases'),
+
+            'allocation_id' => array_get($data, 'allocation.default'),
+            'allocation_additional' => array_get($data, 'allocation.additional'),
+
+            'startup' => array_get($data, 'startup'),
+            'environment' => array_get($data, 'environment'),
+            'egg_id' => array_get($data, 'egg_id'),
+            'image' => array_get($data, 'image'),
+            'skip_scripts' => array_get($data, 'skip_scripts'),
+            'start_on_completion' => array_get($data, 'start_on_completion', false),
         ];
     }
-
-    public function withValidator(Validator $validator)
-    {
-        $validator->sometimes('allocation.default', [
-            'required',
-            'integer',
-            'bail',
-            Rule::exists('allocations', 'id')->where(function ($query) {
-                $query->whereNull('server_id');
-            }),
-        ], function ($input) {
-            return !($input->deploy);
-        });
-
-        $validator->sometimes('allocation.additional.*', [
-            'integer',
-            Rule::exists('allocations', 'id')->where(function ($query) {
-                $query->whereNull('server_id');
-            }),
-        ], function ($input) {
-            return !($input->deploy);
-        });
-
-        $validator->sometimes('deploy.locations', 'present', function ($input) {
-            return $input->deploy;
-        });
-
-        $validator->sometimes('deploy.port_range', 'present', function ($input) {
-            return $input->deploy;
-        });
-    }
-
-    public function getDeploymentObject(): ?DeploymentObject
-    {
-        if (is_null($this->input('deploy'))) {
-            return null;
-        }
-
-        $object = new DeploymentObject();
-        $object->setDedicated($this->input('deploy.dedicated_ip', false));
-        $object->setLocations($this->input('deploy.locations', []));
-        $object->setPorts($this->input('deploy.port_range', []));
-
-        return $object;
-    }
 }
diff --git a/app/Http/Requests/Api/Application/Servers/UpdateServerRequest.php b/app/Http/Requests/Api/Application/Servers/UpdateServerRequest.php
index 37637d664..9b254d047 100644
--- a/app/Http/Requests/Api/Application/Servers/UpdateServerRequest.php
+++ b/app/Http/Requests/Api/Application/Servers/UpdateServerRequest.php
@@ -55,7 +55,7 @@ class UpdateServerRequest extends ApplicationApiRequest
             'io' => array_get($data, 'limits.io'),
             'threads' => array_get($data, 'limits.threads'),
             'cpu' => array_get($data, 'limits.cpu'),
-            'oom_disabled' => array_get($data, 'limits.oom_disabled'),
+            'oom_disabled' => !array_get($data, 'limits.oom_killer'),
 
             'allocation_limit' => array_get($data, 'feature_limits.allocations'),
             'backup_limit' => array_get($data, 'feature_limits.backups'),
diff --git a/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php b/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php
index 5a20084d3..af16d4113 100644
--- a/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php
+++ b/app/Http/Requests/Api/Client/Servers/Subusers/SubuserRequest.php
@@ -65,8 +65,6 @@ abstract class SubuserRequest extends ClientApiRequest
         // Otherwise, get the current subuser's permission set, and ensure that the
         // permissions they are trying to assign are not _more_ than the ones they
         // already have.
-        /** @var \Pterodactyl\Models\Subuser|null $subuser */
-        /** @var \Pterodactyl\Services\Servers\GetUserPermissionsService $service */
         $service = $this->container->make(GetUserPermissionsService::class);
 
         if (count(array_diff($permissions, $service->handle($server, $user))) > 0) {
diff --git a/app/Models/AuditLog.php b/app/Models/AuditLog.php
index 3a25d7a77..7d64ad5f0 100644
--- a/app/Models/AuditLog.php
+++ b/app/Models/AuditLog.php
@@ -101,7 +101,7 @@ class AuditLog extends Model
      * currently authenticated user if available. This model is not saved at this point, so
      * you can always make modifications to it as needed before saving.
      *
-     * @return $this
+     * @return self
      */
     public static function instance(string $action, array $metadata, bool $isSystem = false)
     {
diff --git a/app/Models/DatabaseHost.php b/app/Models/DatabaseHost.php
index 31dad3865..814032425 100644
--- a/app/Models/DatabaseHost.php
+++ b/app/Models/DatabaseHost.php
@@ -2,17 +2,6 @@
 
 namespace Pterodactyl\Models;
 
-/**
- * @property int $id
- * @property string $name
- * @property string $host
- * @property int $port
- * @property string $username
- * @property string $password
- * @property int|null $max_databases
- * @property \Carbon\CarbonImmutable $created_at
- * @property \Carbon\CarbonImmutable $updated_at
- */
 class DatabaseHost extends Model
 {
     /**
diff --git a/app/Models/Egg.php b/app/Models/Egg.php
index 992a54f91..f6efde05e 100644
--- a/app/Models/Egg.php
+++ b/app/Models/Egg.php
@@ -2,46 +2,6 @@
 
 namespace Pterodactyl\Models;
 
-/**
- * @property int $id
- * @property string $uuid
- * @property int $nest_id
- * @property string $author
- * @property string $name
- * @property string|null $description
- * @property array|null $features
- * @property string $docker_image -- deprecated, use $docker_images
- * @property string $update_url
- * @property array $docker_images
- * @property array|null $file_denylist
- * @property string|null $config_files
- * @property string|null $config_startup
- * @property string|null $config_logs
- * @property string|null $config_stop
- * @property int|null $config_from
- * @property string|null $startup
- * @property bool $script_is_privileged
- * @property string|null $script_install
- * @property string $script_entry
- * @property string $script_container
- * @property int|null $copy_script_from
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property string|null $copy_script_install
- * @property string $copy_script_entry
- * @property string $copy_script_container
- * @property string|null $inherit_config_files
- * @property string|null $inherit_config_startup
- * @property string|null $inherit_config_logs
- * @property string|null $inherit_config_stop
- * @property string $inherit_file_denylist
- * @property array|null $inherit_features
- * @property \Pterodactyl\Models\Nest $nest
- * @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Server[] $servers
- * @property \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\EggVariable[] $variables
- * @property \Pterodactyl\Models\Egg|null $scriptFrom
- * @property \Pterodactyl\Models\Egg|null $configFrom
- */
 class Egg extends Model
 {
     /**
@@ -75,14 +35,16 @@ class Egg extends Model
      * @var array
      */
     protected $fillable = [
+        'nest_id',
+        'uuid',
         'name',
         'description',
         'features',
+        'author',
         'docker_images',
         'file_denylist',
         'config_files',
         'config_startup',
-        'config_logs',
         'config_stop',
         'config_from',
         'startup',
@@ -123,7 +85,6 @@ class Egg extends Model
         'config_from' => 'sometimes|bail|nullable|numeric|exists:eggs,id',
         'config_stop' => 'required_without:config_from|nullable|string|max:191',
         'config_startup' => 'required_without:config_from|nullable|json',
-        'config_logs' => 'required_without:config_from|nullable|json',
         'config_files' => 'required_without:config_from|nullable|json',
         'update_url' => 'sometimes|nullable|string',
     ];
@@ -136,7 +97,6 @@ class Egg extends Model
         'file_denylist' => null,
         'config_stop' => null,
         'config_startup' => null,
-        'config_logs' => null,
         'config_files' => null,
         'update_url' => null,
     ];
@@ -164,10 +124,12 @@ class Egg extends Model
      */
     public function getCopyScriptEntryAttribute()
     {
+        // @phpstan-ignore-next-line
         if (!is_null($this->script_entry) || is_null($this->copy_script_from)) {
             return $this->script_entry;
         }
 
+        // @phpstan-ignore-next-line
         return $this->scriptFrom->script_entry;
     }
 
@@ -179,10 +141,12 @@ class Egg extends Model
      */
     public function getCopyScriptContainerAttribute()
     {
+        // @phpstan-ignore-next-line
         if (!is_null($this->script_container) || is_null($this->copy_script_from)) {
             return $this->script_container;
         }
 
+        // @phpstan-ignore-next-line
         return $this->scriptFrom->script_container;
     }
 
@@ -214,20 +178,6 @@ class Egg extends Model
         return $this->configFrom->config_startup;
     }
 
-    /**
-     * Return the log reading configuration for an egg.
-     *
-     * @return string
-     */
-    public function getInheritConfigLogsAttribute()
-    {
-        if (!is_null($this->config_logs) || is_null($this->config_from)) {
-            return $this->config_logs;
-        }
-
-        return $this->configFrom->config_logs;
-    }
-
     /**
      * Return the stop command configuration for an egg.
      *
diff --git a/app/Models/EggVariable.php b/app/Models/EggVariable.php
index 98e3da2c9..43d550ebf 100644
--- a/app/Models/EggVariable.php
+++ b/app/Models/EggVariable.php
@@ -2,26 +2,6 @@
 
 namespace Pterodactyl\Models;
 
-/**
- * @property int $id
- * @property int $egg_id
- * @property string $name
- * @property string $description
- * @property string $env_variable
- * @property string $default_value
- * @property bool $user_viewable
- * @property bool $user_editable
- * @property string $rules
- * @property \Carbon\CarbonImmutable $created_at
- * @property \Carbon\CarbonImmutable $updated_at
- * @property bool $required
- * @property \Pterodactyl\Models\Egg $egg
- * @property \Pterodactyl\Models\ServerVariable $serverVariable
- *
- * The "server_value" variable is only present on the object if you've loaded this model
- * using the server relationship.
- * @property string|null $server_value
- */
 class EggVariable extends Model
 {
     /**
diff --git a/app/Models/Filters/MultiFieldServerFilter.php b/app/Models/Filters/MultiFieldServerFilter.php
index 2aac64e81..b3bdcc830 100644
--- a/app/Models/Filters/MultiFieldServerFilter.php
+++ b/app/Models/Filters/MultiFieldServerFilter.php
@@ -48,6 +48,7 @@ class MultiFieldServerFilter implements Filter
                             }
                         },
                         // Otherwise, just try to search for that specific port in the allocations.
+                        // @phpstan-ignore-next-line
                         function (Builder $builder) use ($value) {
                             $builder->orWhere('allocations.port', 'LIKE', substr($value, 1) . '%');
                         }
diff --git a/app/Models/Model.php b/app/Models/Model.php
index 8e762801a..a62dec655 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -23,22 +23,15 @@ abstract class Model extends IlluminateModel
     /**
      * Determines if the model should undergo data validation before it is saved
      * to the database.
-     *
-     * @var bool
      */
-    protected $skipValidation = false;
+    protected bool $skipValidation = false;
 
     /**
      * The validator instance used by this model.
-     *
-     * @var \Illuminate\Validation\Validator
      */
-    protected $validator;
+    protected ?Validator $validator = null;
 
-    /**
-     * @var \Illuminate\Contracts\Validation\Factory
-     */
-    protected static $validatorFactory;
+    protected static Factory $validatorFactory;
 
     public static array $validationRules = [];
 
@@ -82,6 +75,7 @@ abstract class Model extends IlluminateModel
     {
         $rules = $this->getKey() ? static::getRulesForUpdate($this) : static::getRules();
 
+        // @phpstan-ignore-next-line
         return $this->validator ?: $this->validator = static::$validatorFactory->make(
             [],
             $rules,
diff --git a/app/Models/Node.php b/app/Models/Node.php
index f0bee4d67..51af2697c 100644
--- a/app/Models/Node.php
+++ b/app/Models/Node.php
@@ -8,38 +8,6 @@ use Illuminate\Container\Container;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Contracts\Encryption\Encrypter;
 
-/**
- * @property int $id
- * @property string $uuid
- * @property bool $public
- * @property string $name
- * @property string|null $description
- * @property int $location_id
- * @property int|null $database_host_id
- * @property string $fqdn
- * @property int $listen_port_http
- * @property int $public_port_http
- * @property int $listen_port_sftp
- * @property int $public_port_sftp
- * @property string $scheme
- * @property bool $behind_proxy
- * @property bool $maintenance_mode
- * @property int $memory
- * @property int $memory_overallocate
- * @property int $disk
- * @property int $disk_overallocate
- * @property int $upload_size
- * @property string $daemon_token_id
- * @property string $daemon_token
- * @property string $daemon_base
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property \Pterodactyl\Models\Location $location
- * @property \Pterodactyl\Models\Mount[]|\Illuminate\Database\Eloquent\Collection $mounts
- * @property \Pterodactyl\Models\Server[]|\Illuminate\Database\Eloquent\Collection $servers
- * @property \Pterodactyl\Models\Allocation[]|\Illuminate\Database\Eloquent\Collection $allocations
- * @property \Pterodactyl\Models\DatabaseHost $databaseHost
- */
 class Node extends Model
 {
     use Notifiable;
@@ -275,6 +243,7 @@ class Node extends Model
         $memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
         $diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
 
+        // @phpstan-ignore-next-line
         return ($this->sum_memory + $memory) <= $memoryLimit && ($this->sum_disk + $disk) <= $diskLimit;
     }
 }
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
index b3b127486..7f2c31f81 100644
--- a/app/Models/Permission.php
+++ b/app/Models/Permission.php
@@ -213,7 +213,7 @@ class Permission extends Model
      * Returns all of the permissions available on the system for a user to
      * have when controlling a server.
      *
-     * @return \Illuminate\Database\Eloquent\Collection
+     * @phpstan-return \Illuminate\Support\Collection<string, array{description: string, keys: array<string, string>}>
      */
     public static function permissions(): Collection
     {
diff --git a/app/Models/Server.php b/app/Models/Server.php
index dca0e20d5..ecc6253c5 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -8,50 +8,6 @@ use Illuminate\Database\Query\JoinClause;
 use Znck\Eloquent\Traits\BelongsToThrough;
 use Pterodactyl\Exceptions\Http\Server\ServerStateConflictException;
 
-/**
- * @property int $id
- * @property string|null $external_id
- * @property string $uuid
- * @property string $uuidShort
- * @property int $node_id
- * @property string $name
- * @property string $description
- * @property string|null $status
- * @property bool $skip_scripts
- * @property int $owner_id
- * @property int $memory
- * @property int $swap
- * @property int $disk
- * @property int $io
- * @property int $cpu
- * @property string $threads
- * @property bool $oom_disabled
- * @property int $allocation_id
- * @property int $nest_id
- * @property int $egg_id
- * @property string $startup
- * @property string $image
- * @property int $allocation_limit
- * @property int $database_limit
- * @property int $backup_limit
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property \Pterodactyl\Models\User $user
- * @property \Pterodactyl\Models\Subuser[]|\Illuminate\Database\Eloquent\Collection $subusers
- * @property \Pterodactyl\Models\Allocation $allocation
- * @property \Pterodactyl\Models\Allocation[]|\Illuminate\Database\Eloquent\Collection $allocations
- * @property \Pterodactyl\Models\Node $node
- * @property \Pterodactyl\Models\Nest $nest
- * @property \Pterodactyl\Models\Egg $egg
- * @property \Pterodactyl\Models\EggVariable[]|\Illuminate\Database\Eloquent\Collection $variables
- * @property \Pterodactyl\Models\Schedule[]|\Illuminate\Database\Eloquent\Collection $schedule
- * @property \Pterodactyl\Models\Database[]|\Illuminate\Database\Eloquent\Collection $databases
- * @property \Pterodactyl\Models\Location $location
- * @property \Pterodactyl\Models\ServerTransfer $transfer
- * @property \Pterodactyl\Models\Backup[]|\Illuminate\Database\Eloquent\Collection $backups
- * @property \Pterodactyl\Models\Mount[]|\Illuminate\Database\Eloquent\Collection $mounts
- * @property \Pterodactyl\Models\AuditLog[] $audits
- */
 class Server extends Model
 {
     use BelongsToThrough;
@@ -84,6 +40,7 @@ class Server extends Model
     protected $attributes = [
         'status' => self::STATUS_INSTALLING,
         'oom_disabled' => true,
+        'startup' => null,
     ];
 
     /**
@@ -124,7 +81,7 @@ class Server extends Model
         'allocation_id' => 'required|bail|unique:servers|exists:allocations,id',
         'nest_id' => 'required|exists:nests,id',
         'egg_id' => 'required|exists:eggs,id',
-        'startup' => 'required|string',
+        'startup' => 'nullable|string',
         'skip_scripts' => 'sometimes|boolean',
         'image' => 'required|string|max:191',
         'database_limit' => 'present|nullable|integer|min:0',
@@ -239,6 +196,7 @@ class Server extends Model
      * Gets information for the service variables associated with this server.
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     * @phpstan-return \Illuminate\Database\Eloquent\Relations\HasMany<\Pterodactyl\Models\EggVariable>
      */
     public function variables()
     {
diff --git a/app/Notifications/AccountCreated.php b/app/Notifications/AccountCreated.php
index e52bed5fe..c2fd145d3 100644
--- a/app/Notifications/AccountCreated.php
+++ b/app/Notifications/AccountCreated.php
@@ -58,7 +58,7 @@ class AccountCreated extends Notification implements ShouldQueue
     public function toMail($notifiable)
     {
         $message = (new MailMessage())
-            ->greeting('Hello ' . $this->user->name . '!')
+            ->greeting('Hello ' . $this->user->name_first . '!')
             ->line('You are receiving this email because an account has been created for you on ' . config('app.name') . '.')
             ->line('Username: ' . $this->user->username)
             ->line('Email: ' . $this->user->email);
diff --git a/app/Notifications/MailTested.php b/app/Notifications/MailTested.php
index d0f083acc..ab2cc7a71 100644
--- a/app/Notifications/MailTested.php
+++ b/app/Notifications/MailTested.php
@@ -27,7 +27,7 @@ class MailTested extends Notification
     {
         return (new MailMessage())
             ->subject('Pterodactyl Test Message')
-            ->greeting('Hello ' . $this->user->name . '!')
+            ->greeting('Hello ' . $this->user->name_first . '!')
             ->line('This is a test of the Pterodactyl mail system. You\'re good to go!');
     }
 }
diff --git a/app/Notifications/ServerInstalled.php b/app/Notifications/ServerInstalled.php
index cc5a94313..a115633ac 100644
--- a/app/Notifications/ServerInstalled.php
+++ b/app/Notifications/ServerInstalled.php
@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Notifications;
 
+use Webmozart\Assert\Assert;
 use Illuminate\Bus\Queueable;
 use Pterodactyl\Events\Event;
 use Illuminate\Container\Container;
@@ -33,6 +34,8 @@ class ServerInstalled extends Notification implements ShouldQueue, ReceivesEvent
      */
     public function handle(Event $event): void
     {
+        Assert::propertyExists($event, 'server');
+
         $event->server->loadMissing('user');
 
         $this->server = $event->server;
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index f7a18ac5c..cceb7e4ca 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -2,10 +2,12 @@
 
 namespace Pterodactyl\Providers;
 
+use Illuminate\Support\Str;
 use Laravel\Sanctum\Sanctum;
 use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Subuser;
+use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Pterodactyl\Observers\UserObserver;
@@ -30,6 +32,15 @@ class AppServiceProvider extends ServiceProvider
          * @see https://laravel.com/docs/8.x/sanctum#overriding-default-models
          */
         Sanctum::usePersonalAccessTokenModel(PersonalAccessToken::class);
+
+        // If the APP_URL value is set with https:// make sure we force it here. Theoretically
+        // this should just work with the proxy logic, but there are a lot of cases where it
+        // doesn't, and it triggers a lot of support requests, so lets just head it off here.
+        //
+        // @see https://github.com/pterodactyl/panel/issues/3623
+        if (Str::startsWith(config('app.url') ?? '', 'https://')) {
+            URL::forceScheme('https');
+        }
     }
 
     /**
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index db07b1627..06100b572 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Providers;
 
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Support\Facades\RateLimiter;
@@ -19,44 +20,87 @@ class RouteServiceProvider extends ServiceProvider
     protected $namespace = 'Pterodactyl\Http\Controllers';
 
     /**
-     * Define the routes for the application.
+     * Define your route model bindings, pattern filters, etc.
      */
-    public function map()
+    public function boot()
     {
-        Route::middleware(['web', 'auth', 'csrf'])
-            ->namespace($this->namespace . '\Base')
-            ->group(base_path('routes/base.php'));
+        $this->configureRateLimiting();
 
-        Route::middleware(['web', 'auth', 'admin', 'csrf'])->prefix('/admin')
-            ->namespace($this->namespace . '\Admin')
-            ->group(base_path('routes/admin.php'));
+        $this->routes(function () {
+            Route::middleware(['web', 'auth', 'csrf'])
+                ->namespace("$this->namespace\\Base")
+                ->group(base_path('routes/base.php'));
 
-        Route::middleware(['web', 'csrf'])->prefix('/auth')
-            ->namespace($this->namespace . '\Auth')
-            ->group(base_path('routes/auth.php'));
+            Route::middleware(['web', 'auth', 'admin', 'csrf'])->prefix('/admin')
+                ->namespace("$this->namespace\\Admin")
+                ->group(base_path('routes/admin.php'));
 
-        Route::middleware(['web', 'csrf', 'auth', 'server', 'node.maintenance'])
-            ->prefix('/api/server/{server}')
-            ->namespace($this->namespace . '\Server')
-            ->group(base_path('routes/server.php'));
+            Route::middleware(['web', 'csrf'])->prefix('/auth')
+                ->namespace("$this->namespace\\Auth")
+                ->group(base_path('routes/auth.php'));
 
-        Route::middleware([
-            sprintf('throttle:%s,%s', config('http.rate_limit.application'), config('http.rate_limit.application_period')),
-            'api',
-        ])->prefix('/api/application')
-            ->namespace($this->namespace . '\Api\Application')
-            ->group(base_path('routes/api-application.php'));
+            Route::middleware(['web', 'csrf', 'auth', 'server', 'node.maintenance'])
+                ->prefix('/api/server/{server}')
+                ->namespace("$this->namespace\\Server")
+                ->group(base_path('routes/server.php'));
 
-        Route::middleware([
-            //sprintf('throttle:%s,%s', config('http.rate_limit.client'), config('http.rate_limit.client_period')),
-            'client-api',
-        ])->prefix('/api/client')
-            ->namespace($this->namespace . '\Api\Client')
-            ->group(base_path('routes/api-client.php'));
+            Route::middleware(['api', 'throttle:api.application'])
+                ->prefix('/api/application')
+                ->namespace("$this->namespace\\Api\\Application")
+                ->group(base_path('routes/api-application.php'));
 
-        Route::middleware(['daemon'])->prefix('/api/remote')
-            ->namespace($this->namespace . '\Api\Remote')
-            ->group(base_path('routes/api-remote.php'));
+            Route::middleware(['client-api', 'throttle:api.client'])
+                ->prefix('/api/client')
+                ->namespace("$this->namespace\\Api\\Client")
+                ->group(base_path('routes/api-client.php'));
+
+            Route::middleware(['daemon'])->prefix('/api/remote')
+                ->namespace("$this->namespace\\Api\\Remote")
+                ->group(base_path('routes/api-remote.php'));
+        });
+    }
+
+    /**
+     * Configure the rate limiters for the application.
+     */
+    protected function configureRateLimiting()
+    {
+        // Authentication rate limiting. For login and checkpoint endpoints we'll apply
+        // a limit of 10 requests per minute, for the forgot password endpoint apply a
+        // limit of two per minute for the requester so that there is less ability to
+        // trigger email spam.
+        RateLimiter::for('authentication', function (Request $request) {
+            if ($request->route()->named('auth.post.forgot-password')) {
+                return Limit::perMinute(2)->by($request->ip());
+            }
+
+            return Limit::perMinute(10);
+        });
+
+        // Configure the throttles for both the application and client APIs below.
+        // This is configurable per-instance in "config/http.php". By default this
+        // limiter will be tied to the specific request user, and falls back to the
+        // request IP if there is no request user present for the key.
+        //
+        // This means that an authenticated API user cannot use IP switching to get
+        // around the limits.
+        RateLimiter::for('api.client', function (Request $request) {
+            $key = optional($request->user())->uuid ?: $request->ip();
+
+            return Limit::perMinutes(
+                config('http.rate_limit.client_period'),
+                config('http.rate_limit.client')
+            )->by($key);
+        });
+
+        RateLimiter::for('api.application', function (Request $request) {
+            $key = optional($request->user())->uuid ?: $request->ip();
+
+            return Limit::perMinutes(
+                config('http.rate_limit.application_period'),
+                config('http.rate_limit.application')
+            )->by($key);
+        });
 
         RateLimiter::for('pull', function () {
             return Limit::perMinute(10);
diff --git a/app/Providers/SettingsServiceProvider.php b/app/Providers/SettingsServiceProvider.php
index 71fda215e..447ac3db1 100644
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -21,7 +21,6 @@ class SettingsServiceProvider extends ServiceProvider
     protected $keys = [
         'app:name',
         'app:locale',
-        'app:analytics',
         'recaptcha:enabled',
         'recaptcha:secret_key',
         'recaptcha:website_key',
diff --git a/app/Repositories/Eloquent/BackupRepository.php b/app/Repositories/Eloquent/BackupRepository.php
index 051d0ce42..ef4a1d792 100644
--- a/app/Repositories/Eloquent/BackupRepository.php
+++ b/app/Repositories/Eloquent/BackupRepository.php
@@ -20,10 +20,12 @@ class BackupRepository extends EloquentRepository
     /**
      * Determines if too many backups have been generated by the server.
      *
-     * @return \Pterodactyl\Models\Backup[]|\Illuminate\Support\Collection
+     * @return \Illuminate\Support\Collection
+     * @phpstan-return \Illuminate\Support\Collection<\Pterodactyl\Models\Backup>
      */
     public function getBackupsGeneratedDuringTimespan(int $server, int $seconds = 600)
     {
+        // @phpstan-ignore-next-line
         return $this->getBuilder()
             ->withTrashed()
             ->where('server_id', $server)
diff --git a/app/Repositories/Eloquent/DatabaseRepository.php b/app/Repositories/Eloquent/DatabaseRepository.php
index c42cb91b2..16e024ea6 100644
--- a/app/Repositories/Eloquent/DatabaseRepository.php
+++ b/app/Repositories/Eloquent/DatabaseRepository.php
@@ -89,10 +89,8 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
 
     /**
      * Create a new database user on a given connection.
-     *
-     * @param $max_connections
      */
-    public function createUser(string $username, string $remote, string $password, $max_connections): bool
+    public function createUser(string $username, string $remote, string $password, int $max_connections): bool
     {
         if (!$max_connections) {
             return $this->run(sprintf('CREATE USER `%s`@`%s` IDENTIFIED BY \'%s\'', $username, $remote, $password));
@@ -132,8 +130,6 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
 
     /**
      * Drop a given user on a specific connection.
-     *
-     * @return mixed
      */
     public function dropUser(string $username, string $remote): bool
     {
diff --git a/app/Repositories/Eloquent/EggRepository.php b/app/Repositories/Eloquent/EggRepository.php
index 98b7db453..29307b396 100644
--- a/app/Repositories/Eloquent/EggRepository.php
+++ b/app/Repositories/Eloquent/EggRepository.php
@@ -29,6 +29,8 @@ class EggRepository extends EloquentRepository implements EggRepositoryInterface
     public function getWithVariables(int $id): Egg
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('variables')->findOrFail($id, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
@@ -55,6 +57,8 @@ class EggRepository extends EloquentRepository implements EggRepositoryInterface
         Assert::true((is_digit($value) || is_string($value)), 'First argument passed to getWithCopyAttributes must be an integer or string, received %s.');
 
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('scriptFrom', 'configFrom')->where($column, '=', $value)->firstOrFail($this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
@@ -69,6 +73,8 @@ class EggRepository extends EloquentRepository implements EggRepositoryInterface
     public function getWithExportAttributes(int $id): Egg
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('scriptFrom', 'configFrom', 'variables')->findOrFail($id, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
diff --git a/app/Repositories/Eloquent/EloquentRepository.php b/app/Repositories/Eloquent/EloquentRepository.php
index 3d3e09cdc..25a7ae8e4 100644
--- a/app/Repositories/Eloquent/EloquentRepository.php
+++ b/app/Repositories/Eloquent/EloquentRepository.php
@@ -4,6 +4,7 @@ namespace Pterodactyl\Repositories\Eloquent;
 
 use Illuminate\Http\Request;
 use Webmozart\Assert\Assert;
+use Pterodactyl\Models\Model;
 use Illuminate\Support\Collection;
 use Pterodactyl\Repositories\Repository;
 use Illuminate\Database\Eloquent\Builder;
@@ -25,12 +26,8 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
      * Determines if the repository function should use filters off the request object
      * present when returning results. This allows repository methods to be called in API
      * context's such that we can pass through ?filter[name]=Dane&sort=desc for example.
-     *
-     * @param bool $usingFilters
-     *
-     * @return $this
      */
-    public function usingRequestFilters($usingFilters = true)
+    public function usingRequestFilters(bool $usingFilters = true): self
     {
         $this->useRequestFilters = $usingFilters;
 
@@ -39,26 +36,22 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
 
     /**
      * Returns the request instance.
-     *
-     * @return \Illuminate\Http\Request
      */
-    protected function request()
+    protected function request(): Request
     {
         return $this->app->make(Request::class);
     }
 
     /**
      * Paginate the response data based on the page para.
-     *
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
-    protected function paginate(Builder $instance, int $default = 50)
+    protected function paginate(Builder $instance, int $default = 50): LengthAwarePaginator
     {
         if (!$this->useRequestFilters) {
             return $instance->paginate($default);
         }
 
-        return $instance->paginate($this->request()->query('per_page', $default));
+        return $instance->paginate((int) $this->request()->query('per_page', (string) $default));
     }
 
     /**
@@ -91,15 +84,20 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
      */
     public function create(array $fields, bool $validate = true, bool $force = false)
     {
+        /** @phpstan-var \Illuminate\Database\Eloquent\Model $instance */
         $instance = $this->getBuilder()->newModelInstance();
         ($force) ? $instance->forceFill($fields) : $instance->fill($fields);
 
-        if (!$validate) {
-            $saved = $instance->skipValidation()->save();
-        } else {
-            if (!$saved = $instance->save()) {
-                throw new DataValidationException($instance->getValidator());
+        if ($instance instanceof Model) {
+            if (!$validate) {
+                $saved = $instance->skipValidation()->save();
+            } else {
+                if (!$saved = $instance->save()) {
+                    throw new DataValidationException($instance->getValidator());
+                }
             }
+        } else {
+            $saved = $instance->save();
         }
 
         return ($this->withFresh) ? $instance->fresh() : $saved;
@@ -150,6 +148,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
      */
     public function findCountWhere(array $fields): int
     {
+        // @phpstan-ignore-next-line
         return $this->getBuilder()->where($fields)->count($this->getColumns());
     }
 
@@ -191,12 +190,16 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
 
         ($force) ? $instance->forceFill($fields) : $instance->fill($fields);
 
-        if (!$validate) {
-            $saved = $instance->skipValidation()->save();
-        } else {
-            if (!$saved = $instance->save()) {
-                throw new DataValidationException($instance->getValidator());
+        if ($instance instanceof Model) {
+            if (!$validate) {
+                $saved = $instance->skipValidation()->save();
+            } else {
+                if (!$saved = $instance->save()) {
+                    throw new DataValidationException($instance->getValidator());
+                }
             }
+        } else {
+            $saved = $instance->save();
         }
 
         return ($this->withFresh) ? $instance->fresh() : $saved;
@@ -245,6 +248,7 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
             return $this->create(array_merge($where, $fields), $validate, $force);
         }
 
+        // @phpstan-ignore-next-line
         return $this->update($instance->id, $fields, $validate, $force);
     }
 
diff --git a/app/Repositories/Eloquent/LocationRepository.php b/app/Repositories/Eloquent/LocationRepository.php
index c06d10a9f..151c72bcf 100644
--- a/app/Repositories/Eloquent/LocationRepository.php
+++ b/app/Repositories/Eloquent/LocationRepository.php
@@ -39,13 +39,13 @@ class LocationRepository extends EloquentRepository implements LocationRepositor
     /**
      * Return all of the nodes and their respective count of servers for a location.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithNodes(int $id): Location
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('nodes.servers')->findOrFail($id, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
@@ -55,13 +55,13 @@ class LocationRepository extends EloquentRepository implements LocationRepositor
     /**
      * Return a location and the count of nodes in that location.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithNodeCount(int $id): Location
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->withCount('nodes')->findOrFail($id, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
diff --git a/app/Repositories/Eloquent/MountRepository.php b/app/Repositories/Eloquent/MountRepository.php
index 490f76b64..58d870ecd 100644
--- a/app/Repositories/Eloquent/MountRepository.php
+++ b/app/Repositories/Eloquent/MountRepository.php
@@ -31,13 +31,13 @@ class MountRepository extends EloquentRepository
     /**
      * Return all of the mounts and their respective relations.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithRelations(string $id): Mount
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('eggs', 'nodes')->findOrFail($id, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
diff --git a/app/Repositories/Eloquent/NestRepository.php b/app/Repositories/Eloquent/NestRepository.php
index 7e4884255..131a0d862 100644
--- a/app/Repositories/Eloquent/NestRepository.php
+++ b/app/Repositories/Eloquent/NestRepository.php
@@ -28,15 +28,14 @@ class NestRepository extends EloquentRepository implements NestRepositoryInterfa
     /**
      * Return a nest or all nests with their associated eggs and variables.
      *
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithEggs(int $id = null)
+    public function getWithEggs(int $id = null): Nest
     {
         $instance = $this->getBuilder()->with('eggs', 'eggs.variables');
 
         if (!is_null($id)) {
+            /** @var \Pterodactyl\Models\Nest|null $instance */
             $instance = $instance->find($id, $this->getColumns());
             if (!$instance) {
                 throw new RecordNotFoundException();
@@ -45,45 +44,8 @@ class NestRepository extends EloquentRepository implements NestRepositoryInterfa
             return $instance;
         }
 
+        /* @noinspection PhpIncompatibleReturnTypeInspection */
+        // @phpstan-ignore-next-line
         return $instance->get($this->getColumns());
     }
-
-    /**
-     * Return a nest or all nests and the count of eggs and servers for that nest.
-     *
-     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getWithCounts(int $id = null)
-    {
-        $instance = $this->getBuilder()->withCount(['eggs', 'servers']);
-
-        if (!is_null($id)) {
-            $instance = $instance->find($id, $this->getColumns());
-            if (!$instance) {
-                throw new RecordNotFoundException();
-            }
-
-            return $instance;
-        }
-
-        return $instance->get($this->getColumns());
-    }
-
-    /**
-     * Return a nest along with its associated eggs and the servers relation on those eggs.
-     *
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
-     */
-    public function getWithEggServers(int $id): Nest
-    {
-        $instance = $this->getBuilder()->with('eggs.servers')->find($id, $this->getColumns());
-        if (!$instance) {
-            throw new RecordNotFoundException();
-        }
-
-        /* @var Nest $instance */
-        return $instance;
-    }
 }
diff --git a/app/Repositories/Eloquent/NodeRepository.php b/app/Repositories/Eloquent/NodeRepository.php
index 125a21fb3..39a1beac2 100644
--- a/app/Repositories/Eloquent/NodeRepository.php
+++ b/app/Repositories/Eloquent/NodeRepository.php
@@ -59,7 +59,10 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
             $this->getBuilder()->raw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
         )->join('servers', 'servers.node_id', '=', 'nodes.id')->where('node_id', $node->id)->first();
 
-        return collect(['disk' => $stats->sum_disk, 'memory' => $stats->sum_memory])->mapWithKeys(function ($value, $key) use ($node) {
+        return collect([
+            'disk' => $stats->sum_disk,
+            'memory' => $stats->sum_memory,
+        ])->mapWithKeys(function ($value, $key) use ($node) {
             $maxUsage = $node->{$key};
             if ($node->{$key . '_overallocate'} > 0) {
                 $maxUsage = $node->{$key} * (1 + ($node->{$key . '_overallocate'} / 100));
@@ -85,6 +88,7 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
 
         // This is quite ugly and can probably be improved down the road.
         // And by probably, I mean it should.
+        // @phpstan-ignore-next-line
         if (is_null($node->servers_count) || $refresh) {
             $node->load('servers');
             $node->setRelation('servers_count', count($node->getRelation('servers')));
@@ -118,22 +122,28 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
      */
     public function getNodesForServerCreation(): Collection
     {
-        return $this->getBuilder()->with('allocations')->get()->map(function (Node $item) {
+        /** @phpstan-var \Illuminate\Database\Eloquent\Collection<\Pterodactyl\Models\Node> $collection */
+        $collection = $this->getBuilder()->with('allocations')->get();
+
+        return $collection->map(function (Node $item) {
+            /** @phpstan-var \Illuminate\Support\Collection<array{id: string, ip: string, port: string|int}> $filtered */
             $filtered = $item->getRelation('allocations')->where('server_id', null)->map(function ($map) {
                 return collect($map)->only(['id', 'ip', 'port']);
             });
 
-            $item->ports = $filtered->map(function ($map) {
+            $ports = $filtered->map(function ($map) {
                 return [
                     'id' => $map['id'],
                     'text' => sprintf('%s:%s', $map['ip'], $map['port']),
                 ];
             })->values();
 
+            $item->setAttribute('ports', $ports);
+
             return [
                 'id' => $item->id,
                 'text' => $item->name,
-                'allocations' => $item->ports,
+                'allocations' => $ports,
             ];
         })->values();
     }
@@ -144,11 +154,22 @@ class NodeRepository extends EloquentRepository implements NodeRepositoryInterfa
     public function getNodeWithResourceUsage(int $node_id): Node
     {
         $instance = $this->getBuilder()
-            ->select(['nodes.id', 'nodes.fqdn', 'nodes.public_port_http', 'nodes.scheme', 'nodes.daemon_token', 'nodes.memory', 'nodes.disk', 'nodes.memory_overallocate', 'nodes.disk_overallocate'])
+            ->select([
+                'nodes.id',
+                'nodes.fqdn',
+                'nodes.public_port_http',
+                'nodes.scheme',
+                'nodes.daemon_token',
+                'nodes.memory',
+                'nodes.disk',
+                'nodes.memory_overallocate',
+                'nodes.disk_overallocate',
+            ])
             ->selectRaw('IFNULL(SUM(servers.memory), 0) as sum_memory, IFNULL(SUM(servers.disk), 0) as sum_disk')
             ->leftJoin('servers', 'servers.node_id', '=', 'nodes.id')
             ->where('nodes.id', $node_id);
 
+        /* @noinspection PhpIncompatibleReturnTypeInspection */
         return $instance->first();
     }
 }
diff --git a/app/Repositories/Eloquent/ScheduleRepository.php b/app/Repositories/Eloquent/ScheduleRepository.php
index 5c999df87..b39343bda 100644
--- a/app/Repositories/Eloquent/ScheduleRepository.php
+++ b/app/Repositories/Eloquent/ScheduleRepository.php
@@ -36,6 +36,8 @@ class ScheduleRepository extends EloquentRepository implements ScheduleRepositor
     public function getScheduleWithTasks(int $schedule): Schedule
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('tasks')->findOrFail($schedule, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
diff --git a/app/Repositories/Eloquent/ServerRepository.php b/app/Repositories/Eloquent/ServerRepository.php
index 8bb79c10f..8caeeaee1 100644
--- a/app/Repositories/Eloquent/ServerRepository.php
+++ b/app/Repositories/Eloquent/ServerRepository.php
@@ -74,6 +74,8 @@ class ServerRepository extends EloquentRepository implements ServerRepositoryInt
     public function findWithVariables(int $id): Server
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('egg.variables', 'variables')
                 ->where($this->getModel()->getKeyName(), '=', $id)
                 ->firstOrFail($this->getColumns());
diff --git a/app/Repositories/Eloquent/TaskRepository.php b/app/Repositories/Eloquent/TaskRepository.php
index 718f99490..35a24e8ac 100644
--- a/app/Repositories/Eloquent/TaskRepository.php
+++ b/app/Repositories/Eloquent/TaskRepository.php
@@ -27,6 +27,8 @@ class TaskRepository extends EloquentRepository implements TaskRepositoryInterfa
     public function getTaskForJobProcess(int $id): Task
     {
         try {
+            /* @noinspection PhpIncompatibleReturnTypeInspection */
+            // @phpstan-ignore-next-line
             return $this->getBuilder()->with('server.user', 'schedule')->findOrFail($id, $this->getColumns());
         } catch (ModelNotFoundException $exception) {
             throw new RecordNotFoundException();
diff --git a/app/Repositories/Repository.php b/app/Repositories/Repository.php
index a80051942..2b13e4874 100644
--- a/app/Repositories/Repository.php
+++ b/app/Repositories/Repository.php
@@ -118,7 +118,8 @@ abstract class Repository implements RepositoryInterface
     /**
      * Take the provided model and make it accessible to the rest of the repository.
      *
-     * @param array $model
+     * @param string[] $model
+     * @phpstan-param class-string<\Illuminate\Database\Eloquent\Model> $model
      *
      * @return mixed
      */
@@ -128,6 +129,7 @@ abstract class Repository implements RepositoryInterface
             case 1:
                 return $this->model = $this->app->make($model[0]);
             case 2:
+                // @phpstan-ignore-next-line
                 return $this->model = call_user_func([$this->app->make($model[0]), $model[1]]);
             default:
                 throw new InvalidArgumentException('Model must be a FQDN or an array with a count of two.');
diff --git a/app/Rules/Username.php b/app/Rules/Username.php
index bae204952..a466d3cb2 100644
--- a/app/Rules/Username.php
+++ b/app/Rules/Username.php
@@ -22,7 +22,7 @@ class Username implements Rule
      */
     public function passes($attribute, $value): bool
     {
-        return preg_match(self::VALIDATION_REGEX, mb_strtolower($value));
+        return preg_match(self::VALIDATION_REGEX, mb_strtolower($value)) === 1;
     }
 
     /**
diff --git a/app/Services/Allocations/AssignmentService.php b/app/Services/Allocations/AssignmentService.php
index 878c7307a..f18ccb922 100644
--- a/app/Services/Allocations/AssignmentService.php
+++ b/app/Services/Allocations/AssignmentService.php
@@ -64,6 +64,7 @@ class AssignmentService
             $parsed = Network::parse($underlying);
         } catch (Exception $exception) {
             /* @noinspection PhpUndefinedVariableInspection */
+            // @phpstan-ignore-next-line
             throw new DisplayException("Could not parse provided allocation IP address ({$underlying}): {$exception->getMessage()}", $exception);
         }
 
diff --git a/app/Services/Backups/DeleteBackupService.php b/app/Services/Backups/DeleteBackupService.php
index 66eefe675..6ca87ebbb 100644
--- a/app/Services/Backups/DeleteBackupService.php
+++ b/app/Services/Backups/DeleteBackupService.php
@@ -102,6 +102,7 @@ class DeleteBackupService
             /** @var \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter */
             $adapter = $this->manager->adapter(Backup::ADAPTER_AWS_S3);
 
+            // @phpstan-ignore-next-line this is defined on the actual S3Client class, just not on the interface.
             $adapter->getClient()->deleteObject([
                 'Bucket' => $adapter->getBucket(),
                 'Key' => sprintf('%s/%s.tar.gz', $backup->server->uuid, $backup->uuid),
diff --git a/app/Services/Backups/InitiateBackupService.php b/app/Services/Backups/InitiateBackupService.php
index d368fb609..d3f0480bc 100644
--- a/app/Services/Backups/InitiateBackupService.php
+++ b/app/Services/Backups/InitiateBackupService.php
@@ -9,6 +9,7 @@ use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Extensions\Backups\BackupManager;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;
 use Pterodactyl\Repositories\Wings\DaemonBackupRepository;
 use Pterodactyl\Exceptions\Service\Backup\TooManyBackupsException;
@@ -53,8 +54,6 @@ class InitiateBackupService
 
     /**
      * InitiateBackupService constructor.
-     *
-     * @param \Pterodactyl\Services\Backups\DeleteBackupService $deleteBackupService
      */
     public function __construct(
         BackupRepository $repository,
@@ -140,7 +139,7 @@ class InitiateBackupService
             // Get the oldest backup the server has that is not "locked" (indicating a backup that should
             // never be automatically purged). If we find a backup we will delete it and then continue with
             // this process. If no backup is found that can be used an exception is thrown.
-            /** @var \Pterodactyl\Models\Backup $oldest */
+            /** @var \Pterodactyl\Models\Backup|null $oldest */
             $oldest = $successful->where('is_locked', false)->orderBy('created_at')->first();
             if (!$oldest) {
                 throw new TooManyBackupsException($server->backup_limit);
diff --git a/app/Services/Databases/DatabaseManagementService.php b/app/Services/Databases/DatabaseManagementService.php
index a10b22719..ed2c9e148 100644
--- a/app/Services/Databases/DatabaseManagementService.php
+++ b/app/Services/Databases/DatabaseManagementService.php
@@ -152,6 +152,7 @@ class DatabaseManagementService
             });
         } catch (Exception $exception) {
             try {
+                // @phpstan-ignore-next-line doesn't understand the pass-by-reference above
                 if ($database instanceof Database) {
                     $this->repository->dropDatabase($database->database);
                     $this->repository->dropUser($database->username, $database->remote);
diff --git a/app/Services/Databases/DatabasePasswordService.php b/app/Services/Databases/DatabasePasswordService.php
index aabe98388..882b1c124 100644
--- a/app/Services/Databases/DatabasePasswordService.php
+++ b/app/Services/Databases/DatabasePasswordService.php
@@ -49,8 +49,6 @@ class DatabasePasswordService
     /**
      * Updates a password for a given database.
      *
-     * @param \Pterodactyl\Models\Database|int $database
-     *
      * @throws \Throwable
      */
     public function handle(Database $database): string
diff --git a/app/Services/Eggs/EggConfigurationService.php b/app/Services/Eggs/EggConfigurationService.php
index 4dce8fd25..ebe119c1f 100644
--- a/app/Services/Eggs/EggConfigurationService.php
+++ b/app/Services/Eggs/EggConfigurationService.php
@@ -205,6 +205,7 @@ class EggConfigurationService
             // Replace anything starting with "server." with the value out of the server configuration
             // array that used to be created for the old daemon.
             if (Str::startsWith($key, 'server.')) {
+                // @phpstan-ignore-next-line
                 $plucked = Arr::get($structure, preg_replace('/^server\./', '', $key), '');
 
                 $value = str_replace("{{{$key}}}", $plucked, $value);
@@ -215,6 +216,7 @@ class EggConfigurationService
             // variable from the server configuration.
             $plucked = Arr::get(
                 $structure,
+                // @phpstan-ignore-next-line
                 preg_replace('/^env\./', 'build.env.', $key),
                 ''
             );
diff --git a/app/Services/Eggs/Scripts/InstallScriptService.php b/app/Services/Eggs/Scripts/InstallScriptService.php
index ecd1dc1f3..5273698fe 100644
--- a/app/Services/Eggs/Scripts/InstallScriptService.php
+++ b/app/Services/Eggs/Scripts/InstallScriptService.php
@@ -24,13 +24,11 @@ class InstallScriptService
     /**
      * Modify the install script for a given Egg.
      *
-     * @param int|\Pterodactyl\Models\Egg $egg
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Egg\InvalidCopyFromException
      */
-    public function handle(Egg $egg, array $data)
+    public function handle(Egg $egg, array $data): void
     {
         if (!is_null(array_get($data, 'copy_script_from'))) {
             if (!$this->repository->isCopyableScript(array_get($data, 'copy_script_from'), $egg->nest_id)) {
diff --git a/app/Services/Eggs/Sharing/EggExporterService.php b/app/Services/Eggs/Sharing/EggExporterService.php
index f64656150..38d91d9d4 100644
--- a/app/Services/Eggs/Sharing/EggExporterService.php
+++ b/app/Services/Eggs/Sharing/EggExporterService.php
@@ -27,11 +27,11 @@ class EggExporterService
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(int $egg): string
+    public function handle(int $egg): array
     {
         $egg = $this->repository->getWithExportAttributes($egg);
 
-        $struct = [
+        return [
             '_comment' => 'DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO',
             'meta' => [
                 'version' => 'PTDL_v1',
@@ -50,7 +50,6 @@ class EggExporterService
             'config' => [
                 'files' => $egg->inherit_config_files,
                 'startup' => $egg->inherit_config_startup,
-                'logs' => $egg->inherit_config_logs,
                 'stop' => $egg->inherit_config_stop,
             ],
             'scripts' => [
@@ -66,7 +65,5 @@ class EggExporterService
                     ->toArray();
             }),
         ];
-
-        return json_encode($struct, JSON_PRETTY_PRINT);
     }
 }
diff --git a/app/Services/Eggs/Sharing/EggImporterService.php b/app/Services/Eggs/Sharing/EggImporterService.php
index b6561f63d..a9c750ba0 100644
--- a/app/Services/Eggs/Sharing/EggImporterService.php
+++ b/app/Services/Eggs/Sharing/EggImporterService.php
@@ -14,8 +14,8 @@ use Symfony\Component\Yaml\Exception\ParseException;
 use Pterodactyl\Contracts\Repository\EggRepositoryInterface;
 use Pterodactyl\Contracts\Repository\NestRepositoryInterface;
 use Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException;
-use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Exceptions\Service\Egg\BadYamlFormatException;
+use Pterodactyl\Exceptions\Service\InvalidFileUploadException;
 use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 
 class EggImporterService
@@ -58,7 +58,7 @@ class EggImporterService
     /**
      * Take an uploaded JSON file and parse it into a new egg.
      *
-     * @deprecated Use `handleFile` or `handleContent` instead.
+     * @deprecated use `handleFile` or `handleContent` instead
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Egg\BadJsonFormatException
@@ -151,7 +151,6 @@ class EggImporterService
             'update_url' => Arr::get($parsed, 'meta.update_url'),
             'config_files' => Arr::get($parsed, 'config.files'),
             'config_startup' => Arr::get($parsed, 'config.startup'),
-            'config_logs' => Arr::get($parsed, 'config.logs'),
             'config_stop' => Arr::get($parsed, 'config.stop'),
             'startup' => Arr::get($parsed, 'startup'),
             'script_install' => Arr::get($parsed, 'scripts.installation.script'),
diff --git a/app/Services/Eggs/Sharing/EggUpdateImporterService.php b/app/Services/Eggs/Sharing/EggUpdateImporterService.php
index 205314314..4b860a0b3 100644
--- a/app/Services/Eggs/Sharing/EggUpdateImporterService.php
+++ b/app/Services/Eggs/Sharing/EggUpdateImporterService.php
@@ -74,7 +74,6 @@ class EggUpdateImporterService
             'docker_images' => object_get($parsed, 'images') ?? [object_get($parsed, 'image')],
             'config_files' => object_get($parsed, 'config.files'),
             'config_startup' => object_get($parsed, 'config.startup'),
-            'config_logs' => object_get($parsed, 'config.logs'),
             'config_stop' => object_get($parsed, 'config.stop'),
             'startup' => object_get($parsed, 'startup'),
             'script_install' => object_get($parsed, 'scripts.installation.script'),
diff --git a/app/Services/Eggs/Variables/VariableCreationService.php b/app/Services/Eggs/Variables/VariableCreationService.php
index fa758265b..79010d4f5 100644
--- a/app/Services/Eggs/Variables/VariableCreationService.php
+++ b/app/Services/Eggs/Variables/VariableCreationService.php
@@ -3,31 +3,21 @@
 namespace Pterodactyl\Services\Eggs\Variables;
 
 use Pterodactyl\Models\EggVariable;
-use Illuminate\Contracts\Validation\Factory;
+use Illuminate\Contracts\Validation\Factory as Validator;
 use Pterodactyl\Traits\Services\ValidatesValidationRules;
-use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableCreationService
 {
     use ValidatesValidationRules;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
-     */
-    private $repository;
-
-    /**
-     * @var \Illuminate\Contracts\Validation\Factory
-     */
-    private $validator;
+    private Validator $validator;
 
     /**
      * VariableCreationService constructor.
      */
-    public function __construct(EggVariableRepositoryInterface $repository, Factory $validator)
+    public function __construct(Validator $validator)
     {
-        $this->repository = $repository;
         $this->validator = $validator;
     }
 
@@ -35,7 +25,7 @@ class VariableCreationService
      * Return the validation factory instance to be used by rule validation
      * checking in the trait.
      */
-    protected function getValidator(): Factory
+    protected function getValidator(): Validator
     {
         return $this->validator;
     }
@@ -43,7 +33,6 @@ class VariableCreationService
     /**
      * Create a new variable for a given Egg.
      *
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\BadValidationRuleException
      * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
@@ -59,15 +48,18 @@ class VariableCreationService
 
         $options = array_get($data, 'options') ?? [];
 
-        return $this->repository->create([
+        /** @var \Pterodactyl\Models\EggVariable $model */
+        $model = EggVariable::query()->create([
             'egg_id' => $egg,
             'name' => $data['name'] ?? '',
             'description' => $data['description'] ?? '',
             'env_variable' => $data['env_variable'] ?? '',
             'default_value' => $data['default_value'] ?? '',
-            'user_viewable' => in_array('user_viewable', $options),
-            'user_editable' => in_array('user_editable', $options),
+            'user_viewable' => $data['user_viewable'],
+            'user_editable' => $data['user_editable'],
             'rules' => $data['rules'] ?? '',
         ]);
+
+        return $model;
     }
 }
diff --git a/app/Services/Eggs/Variables/VariableUpdateService.php b/app/Services/Eggs/Variables/VariableUpdateService.php
index da4426c33..49abb0f13 100644
--- a/app/Services/Eggs/Variables/VariableUpdateService.php
+++ b/app/Services/Eggs/Variables/VariableUpdateService.php
@@ -3,22 +3,17 @@
 namespace Pterodactyl\Services\Eggs\Variables;
 
 use Illuminate\Support\Str;
+use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\EggVariable;
 use Illuminate\Contracts\Validation\Factory;
 use Pterodactyl\Exceptions\DisplayException;
 use Pterodactyl\Traits\Services\ValidatesValidationRules;
-use Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface;
 use Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException;
 
 class VariableUpdateService
 {
     use ValidatesValidationRules;
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\EggVariableRepositoryInterface
-     */
-    private $repository;
-
     /**
      * @var \Illuminate\Contracts\Validation\Factory
      */
@@ -27,9 +22,8 @@ class VariableUpdateService
     /**
      * VariableUpdateService constructor.
      */
-    public function __construct(EggVariableRepositoryInterface $repository, Factory $validator)
+    public function __construct(Factory $validator)
     {
-        $this->repository = $repository;
         $this->validator = $validator;
     }
 
@@ -45,27 +39,22 @@ class VariableUpdateService
     /**
      * Update a specific egg variable.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
-     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
-     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\Egg\Variable\ReservedVariableNameException
      */
-    public function handle(EggVariable $variable, array $data)
+    public function handle(Egg $egg, array $data)
     {
         if (!is_null(array_get($data, 'env_variable'))) {
             if (in_array(strtoupper(array_get($data, 'env_variable')), explode(',', EggVariable::RESERVED_ENV_NAMES))) {
                 throw new ReservedVariableNameException(trans('exceptions.service.variables.reserved_name', ['name' => array_get($data, 'env_variable')]));
             }
 
-            $search = $this->repository->setColumns('id')->findCountWhere([
-                ['env_variable', '=', $data['env_variable']],
-                ['egg_id', '=', $variable->egg_id],
-                ['id', '!=', $variable->id],
-            ]);
+            $count = $egg->variables()
+                ->where('egg_variables.env_variable', $data['env_variable'])
+                ->where('egg_variables.id', '!=', $data['id'])
+                ->count();
 
-            if ($search > 0) {
+            if ($count > 0) {
                 throw new DisplayException(trans('exceptions.service.variables.env_not_unique', ['name' => array_get($data, 'env_variable')]));
             }
         }
@@ -80,13 +69,13 @@ class VariableUpdateService
 
         $options = array_get($data, 'options') ?? [];
 
-        return $this->repository->withoutFreshModel()->update($variable->id, [
+        $egg->variables()->where('egg_variables.id', $data['id'])->update([
             'name' => $data['name'] ?? '',
             'description' => $data['description'] ?? '',
             'env_variable' => $data['env_variable'] ?? '',
             'default_value' => $data['default_value'] ?? '',
-            'user_viewable' => in_array('user_viewable', $options),
-            'user_editable' => in_array('user_editable', $options),
+            'user_viewable' => $data['user_viewable'],
+            'user_editable' => $data['user_editable'],
             'rules' => $data['rules'] ?? '',
         ]);
     }
diff --git a/app/Services/Helpers/SoftwareVersionService.php b/app/Services/Helpers/SoftwareVersionService.php
index f601e6f20..83a47c510 100644
--- a/app/Services/Helpers/SoftwareVersionService.php
+++ b/app/Services/Helpers/SoftwareVersionService.php
@@ -6,6 +6,7 @@ use Exception;
 use GuzzleHttp\Client;
 use Carbon\CarbonImmutable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
 use Pterodactyl\Exceptions\Service\Helper\CdnVersionFetchingException;
 
diff --git a/app/Services/Nodes/NodeDeletionService.php b/app/Services/Nodes/NodeDeletionService.php
index 30483a826..e8a1dc887 100644
--- a/app/Services/Nodes/NodeDeletionService.php
+++ b/app/Services/Nodes/NodeDeletionService.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Services\Nodes;
 
@@ -48,23 +41,15 @@ class NodeDeletionService
     /**
      * Delete a node from the panel if no servers are attached to it.
      *
-     * @param int|\Pterodactyl\Models\Node $node
-     *
-     * @return bool|null
-     *
      * @throws \Pterodactyl\Exceptions\Service\HasActiveServersException
      */
-    public function handle($node)
+    public function handle(Node $node): void
     {
-        if ($node instanceof Node) {
-            $node = $node->id;
-        }
-
-        $servers = $this->serverRepository->setColumns('id')->findCountWhere([['node_id', '=', $node]]);
+        $servers = $this->serverRepository->setColumns('id')->findCountWhere([['node_id', '=', $node->id]]);
         if ($servers > 0) {
-            throw new HasActiveServersException($this->translator->trans('exceptions.node.servers_attached'));
+            throw new HasActiveServersException($this->translator->get('exceptions.node.servers_attached'));
         }
 
-        return $this->repository->delete($node);
+        $this->repository->delete($node->id);
     }
 }
diff --git a/app/Services/Nodes/NodeJWTService.php b/app/Services/Nodes/NodeJWTService.php
index 1b52479ba..9a72bf21d 100644
--- a/app/Services/Nodes/NodeJWTService.php
+++ b/app/Services/Nodes/NodeJWTService.php
@@ -63,8 +63,6 @@ class NodeJWTService
     /**
      * Generate a new JWT for a given node.
      *
-     * @param string|null $identifiedBy
-     *
      * @return \Lcobucci\JWT\Token\Plain
      */
     public function handle(Node $node, string $identifiedBy, string $algo = 'md5')
diff --git a/app/Services/Schedules/ProcessScheduleService.php b/app/Services/Schedules/ProcessScheduleService.php
index a131ad573..9559dc129 100644
--- a/app/Services/Schedules/ProcessScheduleService.php
+++ b/app/Services/Schedules/ProcessScheduleService.php
@@ -45,7 +45,7 @@ class ProcessScheduleService
      */
     public function handle(Schedule $schedule, bool $now = false)
     {
-        /** @var \Pterodactyl\Models\Task $task */
+        /** @var \Pterodactyl\Models\Task|null $task */
         $task = $schedule->tasks()->orderBy('sequence_id')->first();
 
         if (is_null($task)) {
diff --git a/app/Services/Servers/BuildModificationService.php b/app/Services/Servers/BuildModificationService.php
index 66eb52235..152ea9d6e 100644
--- a/app/Services/Servers/BuildModificationService.php
+++ b/app/Services/Servers/BuildModificationService.php
@@ -33,8 +33,6 @@ class BuildModificationService
      * BuildModificationService constructor.
      *
      * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $structureService
-     * @param \Illuminate\Database\ConnectionInterface $connection
-     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonServerRepository
      */
     public function __construct(
         ServerConfigurationStructureService $structureService,
@@ -57,7 +55,7 @@ class BuildModificationService
     public function handle(Server $server, array $data)
     {
         /** @var \Pterodactyl\Models\Server $server */
-        $server = $this->connection->transaction(function() use ($server, $data) {
+        $server = $this->connection->transaction(function () use ($server, $data) {
             $this->processAllocations($server, $data);
 
             if (isset($data['allocation_id']) && $data['allocation_id'] != $server->allocation_id) {
@@ -115,11 +113,12 @@ class BuildModificationService
             $query = Allocation::query()
                 ->where('node_id', $server->node_id)
                 ->whereIn('id', $data['add_allocations'])
-                ->whereNull('server_id');
+                ->whereNull('server_id')
+                ->first();
 
             // Keep track of all the allocations we're just now adding so that we can use the first
             // one to reset the default allocation to.
-            $freshlyAllocated = $query->pluck('id')->first();
+            $freshlyAllocated = optional($query)->id;
 
             $query->update(['server_id' => $server->id, 'notes' => null]);
         }
diff --git a/app/Services/Servers/EnvironmentService.php b/app/Services/Servers/EnvironmentService.php
index 54b82bab3..18593e2c2 100644
--- a/app/Services/Servers/EnvironmentService.php
+++ b/app/Services/Servers/EnvironmentService.php
@@ -36,6 +36,7 @@ class EnvironmentService
     public function handle(Server $server): array
     {
         $variables = $server->variables->toBase()->mapWithKeys(function (EggVariable $variable) {
+            // @phpstan-ignore-next-line
             return [$variable->env_variable => $variable->server_value ?? $variable->default_value];
         });
 
diff --git a/app/Services/Servers/ServerConfigurationStructureService.php b/app/Services/Servers/ServerConfigurationStructureService.php
index 8d68d7de8..c675f855e 100644
--- a/app/Services/Servers/ServerConfigurationStructureService.php
+++ b/app/Services/Servers/ServerConfigurationStructureService.php
@@ -49,7 +49,7 @@ class ServerConfigurationStructureService
             'uuid' => $server->uuid,
             'suspended' => $server->isSuspended(),
             'environment' => $this->environment->handle($server),
-            'invocation' => $server->startup,
+            'invocation' => !is_null($server->startup) ? $server->startup : $server->egg->startup,
             'skip_egg_scripts' => $server->skip_scripts,
             'build' => [
                 'memory_limit' => $server->memory,
@@ -62,11 +62,6 @@ class ServerConfigurationStructureService
             ],
             'container' => [
                 'image' => $server->image,
-                // This field is deprecated — use the value in the "build" block.
-                //
-                // TODO: remove this key in V2.
-                'oom_disabled' => $server->oom_disabled,
-                'requires_rebuild' => false,
             ],
             'allocations' => [
                 'default' => [
diff --git a/app/Services/Servers/StartupCommandService.php b/app/Services/Servers/StartupCommandService.php
index efdbbc5c4..b8e2d210a 100644
--- a/app/Services/Servers/StartupCommandService.php
+++ b/app/Services/Servers/StartupCommandService.php
@@ -16,9 +16,10 @@ class StartupCommandService
 
         foreach ($server->variables as $variable) {
             $find[] = '{{' . $variable->env_variable . '}}';
+            // @phpstan-ignore-next-line
             $replace[] = ($variable->user_viewable && !$hideAllValues) ? ($variable->server_value ?? $variable->default_value) : '[hidden]';
         }
 
-        return str_replace($find, $replace, $server->startup);
+        return str_replace($find, $replace, !is_null($server->startup) ? $server->startup : $server->egg->startup);
     }
 }
diff --git a/app/Services/Servers/StartupModificationService.php b/app/Services/Servers/StartupModificationService.php
index 66645e4f2..d9aee68b8 100644
--- a/app/Services/Servers/StartupModificationService.php
+++ b/app/Services/Servers/StartupModificationService.php
@@ -93,10 +93,15 @@ class StartupModificationService
             ]);
         }
 
+        $startup = $server->startup;
+        if (Arr::exists($data, 'startup')) {
+            $startup = $data['startup'];
+        }
+
         $server->fill([
-            'startup' => $data['startup'] ?? $server->startup,
+            'startup' => $startup,
             'skip_scripts' => $data['skip_scripts'] ?? isset($data['skip_scripts']),
-            'image' => $data['docker_image'] ?? $server->image,
+            'image' => $data['image'] ?? $server->image,
         ])->save();
     }
 }
diff --git a/app/Services/Servers/SuspensionService.php b/app/Services/Servers/SuspensionService.php
index f7d0f77b1..27bc622f5 100644
--- a/app/Services/Servers/SuspensionService.php
+++ b/app/Services/Servers/SuspensionService.php
@@ -58,15 +58,20 @@ class SuspensionService
             throw new ConflictHttpException('Cannot toggle suspension status on a server that is currently being transferred.');
         }
 
-        $this->connection->transaction(function () use ($action, $server, $isSuspending) {
-            $server->update([
-                'status' => $isSuspending ? Server::STATUS_SUSPENDED : null,
-            ]);
+        // Update the server's suspension status.
+        $server->update([
+            'status' => $isSuspending ? Server::STATUS_SUSPENDED : null,
+        ]);
 
-            // Only trigger a Wings server sync if it is not currently being transferred.
-            if (is_null($server->transfer)) {
-                $this->daemonServerRepository->setServer($server)->sync();
-            }
-        });
+        try {
+            // Tell wings to re-sync the server state.
+            $this->daemonServerRepository->setServer($server)->sync();
+        } catch (\Exception $exception) {
+            // Rollback the server's suspension status if wings fails to sync the server.
+            $server->update([
+                'status' => $isSuspending ? null : Server::STATUS_SUSPENDED,
+            ]);
+            throw $exception;
+        }
     }
 }
diff --git a/app/Services/Servers/TransferService.php b/app/Services/Servers/TransferService.php
index 35aed0659..c2db504c3 100644
--- a/app/Services/Servers/TransferService.php
+++ b/app/Services/Servers/TransferService.php
@@ -4,15 +4,9 @@ namespace Pterodactyl\Services\Servers;
 
 use Pterodactyl\Models\Server;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
-use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class TransferService
 {
-    /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
-     */
-    private $repository;
-
     /**
      * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
      */
@@ -21,19 +15,14 @@ class TransferService
     /**
      * TransferService constructor.
      */
-    public function __construct(
-        DaemonServerRepository $daemonServerRepository,
-        ServerRepositoryInterface $repository
-    ) {
-        $this->repository = $repository;
+    public function __construct(DaemonServerRepository $daemonServerRepository)
+    {
         $this->daemonServerRepository = $daemonServerRepository;
     }
 
     /**
      * Requests an archive from the daemon.
      *
-     * @param int|\Pterodactyl\Models\Server $server
-     *
      * @throws \Throwable
      */
     public function requestArchive(Server $server)
diff --git a/app/Services/Users/UserDeletionService.php b/app/Services/Users/UserDeletionService.php
index 87459773e..f00b57341 100644
--- a/app/Services/Users/UserDeletionService.php
+++ b/app/Services/Users/UserDeletionService.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Services\Users;
 
@@ -48,23 +41,15 @@ class UserDeletionService
     /**
      * Delete a user from the panel only if they have no servers attached to their account.
      *
-     * @param int|\Pterodactyl\Models\User $user
-     *
-     * @return bool|null
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      */
-    public function handle($user)
+    public function handle(User $user): void
     {
-        if ($user instanceof User) {
-            $user = $user->id;
-        }
-
-        $servers = $this->serverRepository->setColumns('id')->findCountWhere([['owner_id', '=', $user]]);
+        $servers = $this->serverRepository->setColumns('id')->findCountWhere([['owner_id', '=', $user->id]]);
         if ($servers > 0) {
-            throw new DisplayException($this->translator->trans('admin/user.exceptions.user_has_servers'));
+            throw new DisplayException($this->translator->get('admin/user.exceptions.user_has_servers'));
         }
 
-        return $this->repository->delete($user);
+        $this->repository->delete($user->id);
     }
 }
diff --git a/app/Services/Users/UserUpdateService.php b/app/Services/Users/UserUpdateService.php
index 31f4010b6..a09a0a1a1 100644
--- a/app/Services/Users/UserUpdateService.php
+++ b/app/Services/Users/UserUpdateService.php
@@ -25,8 +25,6 @@ class UserUpdateService
 
     /**
      * Update the user model instance and return the updated model.
-     *
-     * @throws \Throwable
      */
     public function handle(User $user, array $data): User
     {
diff --git a/app/Traits/Helpers/AvailableLanguages.php b/app/Traits/Helpers/AvailableLanguages.php
index 479722976..e9884dbc0 100644
--- a/app/Traits/Helpers/AvailableLanguages.php
+++ b/app/Traits/Helpers/AvailableLanguages.php
@@ -8,14 +8,14 @@ use Illuminate\Filesystem\Filesystem;
 trait AvailableLanguages
 {
     /**
-     * @var \Illuminate\Filesystem\Filesystem
+     * @var \Illuminate\Filesystem\Filesystem|null;
      */
-    private $filesystem;
+    private $filesystem = null;
 
     /**
-     * @var \Matriphe\ISO639\ISO639
+     * @var \Matriphe\ISO639\ISO639|null
      */
-    private $iso639;
+    private $iso639 = null;
 
     /**
      * Return all of the available languages on the Panel based on those
diff --git a/app/Transformers/Api/Application/DatabaseHostTransformer.php b/app/Transformers/Api/Application/DatabaseHostTransformer.php
index dd45c3614..dd272a7ea 100644
--- a/app/Transformers/Api/Application/DatabaseHostTransformer.php
+++ b/app/Transformers/Api/Application/DatabaseHostTransformer.php
@@ -28,6 +28,7 @@ class DatabaseHostTransformer extends Transformer
             'host' => $model->host,
             'port' => $model->port,
             'username' => $model->username,
+            // @phpstan-ignore-next-line no clue why it can't find this.
             'node' => $model->node_id,
             'created_at' => self::formatTimestamp($model->created_at),
             'updated_at' => self::formatTimestamp($model->updated_at),
diff --git a/app/Transformers/Api/Application/EggTransformer.php b/app/Transformers/Api/Application/EggTransformer.php
index b6ebbc97d..90680152f 100644
--- a/app/Transformers/Api/Application/EggTransformer.php
+++ b/app/Transformers/Api/Application/EggTransformer.php
@@ -41,10 +41,9 @@ class EggTransformer extends Transformer
             'docker_image' => count($model->docker_images) > 0 ? $model->docker_images[0] : '',
             'docker_images' => $model->docker_images,
             'config' => [
-                'files' => json_decode($model->config_files, true),
-                'startup' => json_decode($model->config_startup, true),
+                'files' => json_decode($model->config_files),
+                'startup' => json_decode($model->config_startup),
                 'stop' => $model->config_stop,
-                'logs' => json_decode($model->config_logs, true),
                 'file_denylist' => $model->file_denylist,
                 'extends' => $model->config_from,
             ],
@@ -106,7 +105,6 @@ class EggTransformer extends Transformer
                 'files' => json_decode($model->inherit_config_files),
                 'startup' => json_decode($model->inherit_config_startup),
                 'stop' => $model->inherit_config_stop,
-                'logs' => json_decode($model->inherit_config_logs),
             ];
         });
     }
diff --git a/app/Transformers/Api/Application/ServerVariableTransformer.php b/app/Transformers/Api/Application/ServerVariableTransformer.php
index 8a9b910db..172519f11 100644
--- a/app/Transformers/Api/Application/ServerVariableTransformer.php
+++ b/app/Transformers/Api/Application/ServerVariableTransformer.php
@@ -40,6 +40,8 @@ class ServerVariableTransformer extends Transformer
             return $this->null();
         }
 
+        // TODO: confirm this code?
+        // @phpstan-ignore-next-line This might actually be wrong, not sure?
         return $this->item($variable->variable, new EggVariableTransformer());
     }
 }
diff --git a/app/Transformers/Api/Client/EggVariableTransformer.php b/app/Transformers/Api/Client/EggVariableTransformer.php
index f37153e7a..50635e3df 100644
--- a/app/Transformers/Api/Client/EggVariableTransformer.php
+++ b/app/Transformers/Api/Client/EggVariableTransformer.php
@@ -27,7 +27,7 @@ class EggVariableTransformer extends Transformer
             'description' => $variable->description,
             'env_variable' => $variable->env_variable,
             'default_value' => $variable->default_value,
-            'server_value' => $variable->server_value,
+            'server_value' => property_exists($variable, 'server_value') ? $variable->server_value : null,
             'is_editable' => $variable->user_editable,
             'rules' => $variable->rules,
         ];
diff --git a/app/Transformers/Api/Client/StatsTransformer.php b/app/Transformers/Api/Client/StatsTransformer.php
index b438a8e1f..1d428a204 100644
--- a/app/Transformers/Api/Client/StatsTransformer.php
+++ b/app/Transformers/Api/Client/StatsTransformer.php
@@ -23,6 +23,7 @@ class StatsTransformer extends Transformer
                 'disk_bytes' => Arr::get($data, 'utilization.disk_bytes', 0),
                 'network_rx_bytes' => Arr::get($data, 'utilization.network.rx_bytes', 0),
                 'network_tx_bytes' => Arr::get($data, 'utilization.network.tx_bytes', 0),
+                'uptime' => Arr::get($data, 'utilization.uptime', 0),
             ],
         ];
     }
diff --git a/app/Transformers/Api/Transformer.php b/app/Transformers/Api/Transformer.php
index 91fdc0a3e..413d61de5 100644
--- a/app/Transformers/Api/Transformer.php
+++ b/app/Transformers/Api/Transformer.php
@@ -5,6 +5,7 @@ namespace Pterodactyl\Transformers\Api;
 use Closure;
 use DateTimeInterface;
 use Carbon\CarbonImmutable;
+use Carbon\CarbonInterface;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\User;
 use Webmozart\Assert\Assert;
@@ -64,7 +65,7 @@ abstract class Transformer extends TransformerAbstract
      *
      * @param mixed $data
      * @param callable|\League\Fractal\TransformerAbstract $transformer
-     * @param null $resourceKey
+     * @param string|null $resourceKey
      *
      * @return \League\Fractal\Resource\Item
      */
@@ -76,7 +77,7 @@ abstract class Transformer extends TransformerAbstract
 
         $item = parent::item($data, $transformer, $resourceKey);
 
-        if (!$item->getResourceKey()) {
+        if (!$item->getResourceKey() && method_exists($transformer, 'getResourceName')) {
             $item->setResourceKey($transformer->getResourceName());
         }
 
@@ -88,7 +89,7 @@ abstract class Transformer extends TransformerAbstract
      *
      * @param mixed $data
      * @param callable|\League\Fractal\TransformerAbstract $transformer
-     * @param null $resourceKey
+     * @param string|null $resourceKey
      *
      * @return \League\Fractal\Resource\Collection
      */
@@ -100,7 +101,7 @@ abstract class Transformer extends TransformerAbstract
 
         $collection = parent::collection($data, $transformer, $resourceKey);
 
-        if (!$collection->getResourceKey()) {
+        if (!$collection->getResourceKey() && method_exists($transformer, 'getResourceName')) {
             $collection->setResourceKey($transformer->getResourceName());
         }
 
@@ -151,7 +152,7 @@ abstract class Transformer extends TransformerAbstract
         if ($timestamp instanceof DateTimeInterface) {
             $value = CarbonImmutable::instance($timestamp);
         } else {
-            $value = CarbonImmutable::createFromFormat(CarbonImmutable::DEFAULT_TO_STRING_FORMAT, $timestamp);
+            $value = CarbonImmutable::createFromFormat(CarbonInterface::DEFAULT_TO_STRING_FORMAT, $timestamp);
         }
 
         return $value->setTimezone($tz ?? self::$timezone)->toIso8601String();
diff --git a/app/helpers.php b/app/helpers.php
index 9c1b4ed1b..484aacec6 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -21,8 +21,8 @@ if (!function_exists('object_get_strict')) {
      * and will not trigger the response of a default value (unlike object_get).
      *
      * @param object $object
-     * @param string $key
-     * @param null $default
+     * @param string|null $key
+     * @param mixed|null $default
      *
      * @return mixed
      */
diff --git a/composer.json b/composer.json
index 03d821a1e..04303a415 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "guzzlehttp/guzzle": "^7.3",
         "hashids/hashids": "^4.1",
         "laracasts/utilities": "^3.2",
-        "laravel/framework": "^8.58",
+        "laravel/framework": "^8.68",
         "laravel/helpers": "^1.4",
         "laravel/sanctum": "^2.11",
         "laravel/tinker": "^2.6",
@@ -55,7 +55,9 @@
         "laravel/dusk": "^6.18",
         "mockery/mockery": "^1.4",
         "nunomaduro/collision": "^5.9",
+        "nunomaduro/larastan": "^0.7.15",
         "php-mock/php-mock-phpunit": "^2.6",
+        "phpstan/phpstan-webmozart-assert": "^0.12.16",
         "phpunit/phpunit": "^9.5"
     },
     "autoload": {
diff --git a/config/cache.php b/config/cache.php
index 056522262..27276c200 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -14,7 +14,7 @@ return [
     |
     */
 
-    'default' => env('CACHE_DRIVER', 'file'),
+    'default' => env('CACHE_DRIVER', 'redis'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/pterodactyl.php b/config/pterodactyl.php
index b7cd12559..e21d1859f 100644
--- a/config/pterodactyl.php
+++ b/config/pterodactyl.php
@@ -84,8 +84,8 @@ return [
     | Configure the timeout to be used for Guzzle connections here.
     */
     'guzzle' => [
-        'timeout' => env('GUZZLE_TIMEOUT', 30),
-        'connect_timeout' => env('GUZZLE_CONNECT_TIMEOUT', 10),
+        'timeout' => env('GUZZLE_TIMEOUT', 15),
+        'connect_timeout' => env('GUZZLE_CONNECT_TIMEOUT', 5),
     ],
 
     /*
diff --git a/config/queue.php b/config/queue.php
index 326a575dd..02588bb3e 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -14,7 +14,7 @@ return [
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', env('QUEUE_DRIVER', 'database')),
+    'default' => env('QUEUE_CONNECTION', env('QUEUE_DRIVER', 'redis')),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/session.php b/config/session.php
index 9d99eaf80..058528e5f 100644
--- a/config/session.php
+++ b/config/session.php
@@ -14,7 +14,7 @@ return [
     |
     */
 
-    'driver' => env('SESSION_DRIVER', 'database'),
+    'driver' => env('SESSION_DRIVER', 'redis'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/database/Seeders/eggs/minecraft/egg-bungeecord.json b/database/Seeders/eggs/minecraft/egg-bungeecord.json
index 0df945cf0..ac3749c8c 100644
--- a/database/Seeders/eggs/minecraft/egg-bungeecord.json
+++ b/database/Seeders/eggs/minecraft/egg-bungeecord.json
@@ -4,25 +4,27 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-04T19:18:34-04:00",
+    "exported_at": "2021-11-14T19:23:12+00:00",
     "name": "Bungeecord",
     "author": "support@pterodactyl.io",
     "description": "For a long time, Minecraft server owners have had a dream that encompasses a free, easy, and reliable way to connect multiple Minecraft servers together. BungeeCord is the answer to said dream. Whether you are a small server wishing to string multiple game-modes together, or the owner of the ShotBow Network, BungeeCord is the ideal solution for you. With the help of BungeeCord, you will be able to unlock your community's full potential.",
     "features": [
         "eula",
-        "java_version"
+        "java_version",
+        "pid_limit"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
     "config": {
         "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"listeners[0].query_port\": \"{{server.build.default.port}}\",\r\n            \"listeners[0].host\": \"0.0.0.0:{{server.build.default.port}}\",\r\n            \"servers.*.address\": {\r\n                \"regex:^(127\\\\.0\\\\.0\\\\.1|localhost)(:\\\\d{1,5})?$\": \"{{config.docker.interface}}$2\"\r\n            }\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Listening on \"\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"proxy.log.0\"\r\n}",
+        "logs": "{}",
         "stop": "end"
     },
     "scripts": {
diff --git a/database/Seeders/eggs/minecraft/egg-forge-minecraft.json b/database/Seeders/eggs/minecraft/egg-forge-minecraft.json
index fa750a449..a077df6d1 100644
--- a/database/Seeders/eggs/minecraft/egg-forge-minecraft.json
+++ b/database/Seeders/eggs/minecraft/egg-forge-minecraft.json
@@ -4,30 +4,32 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-04T19:18:55-04:00",
+    "exported_at": "2021-12-11T22:51:29+00:00",
     "name": "Forge Minecraft",
     "author": "support@pterodactyl.io",
     "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.",
     "features": [
         "eula",
-        "java_version"
+        "java_version",
+        "pid_limit"
     ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
-    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
+    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true $( [[  ! -f unix_args.txt ]] && printf %s \"-jar {{SERVER_JARFILE}}\" || printf %s \"@unix_args.txt\" )",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \"\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "logs": "{}",
         "stop": "stop"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\n#Go into main direction\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\nif [ ! -z ${FORGE_VERSION} ]; then\r\n    DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n    FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n    JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n    if [ \"${MC_VERSION}\" == \"latest\" ] || [ \"${MC_VERSION}\" == \"\" ] ; then\r\n        echo -e \"getting latest recommended version of forge.\"\r\n        MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"recommended\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n    \tBUILD_TYPE=recommended\r\n    fi\r\n\r\n    if [ \"${BUILD_TYPE}\" != \"recommended\" ] && [ \"${BUILD_TYPE}\" != \"latest\" ]; then\r\n        BUILD_TYPE=recommended\r\n    fi\r\n\r\n    echo -e \"minecraft version: ${MC_VERSION}\"\r\n    echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n    ## some variables for getting versions and things\r\n\tFILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n    ## locating the forge version\r\n    if [ \"${VERSION_KEY}\" == \"\" ] && [ \"${BUILD_TYPE}\" == \"recommended\" ]; then\r\n        echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n        VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"recommended\"))')\r\n    fi\r\n\r\n    ## Error if the mc version set wasn't valid.\r\n    if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n    \techo -e \"The install failed because there is no valid version of forge for the version on minecraft selected.\"\r\n    \texit 1\r\n    fi\r\n\r\n    FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n    if [ \"${MC_VERSION}\" == \"1.7.10\" ] || [ \"${MC_VERSION}\" == \"1.8.9\" ]; then\r\n        DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n        FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n        if [ \"${MC_VERSION}\" == \"1.7.10\" ]; then\r\n            FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n        fi\r\n    else\r\n        DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n        FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n    fi\r\nfi\r\n\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n        echo -e \"installer jar download link is valid.\"\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nelse\r\n    echo -e \"no download link closing out\"\r\n    exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/installer.jar ]; then\r\n    echo \"!!! Error by downloading forge version ${FORGE_VERSION} !!!\"\r\n    exit\r\nfi\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n\r\nmv $FORGE_JAR $SERVER_JARFILE\r\n\r\n#Deleting installer.jar\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
+            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq\r\n\r\nif [[ ! -d \/mnt\/server ]]; then\r\n  mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\n# Remove spaces from the version number to avoid issues with curl\r\nFORGE_VERSION=\"$(echo \"$FORGE_VERSION\" | tr -d ' ')\"\r\nMC_VERSION=\"$(echo \"$MC_VERSION\" | tr -d ' ')\"\r\n\r\nif [[ ! -z ${FORGE_VERSION} ]]; then\r\n  DOWNLOAD_LINK=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/${FORGE_VERSION}\/forge-${FORGE_VERSION}\r\n  FORGE_JAR=forge-${FORGE_VERSION}*.jar\r\nelse\r\n  JSON_DATA=$(curl -sSL https:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/promotions_slim.json)\r\n\r\n  if [[ \"${MC_VERSION}\" == \"latest\" ]] || [[ \"${MC_VERSION}\" == \"\" ]]; then\r\n    echo -e \"getting latest version of forge.\"\r\n    MC_VERSION=$(echo -e ${JSON_DATA} | jq -r '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains(\"latest\")) | split(\"-\")[0]' | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -1)\r\n    BUILD_TYPE=latest\r\n  fi\r\n\r\n  if [[ \"${BUILD_TYPE}\" != \"recommended\" ]] && [[ \"${BUILD_TYPE}\" != \"latest\" ]]; then\r\n    BUILD_TYPE=recommended\r\n  fi\r\n\r\n  echo -e \"minecraft version: ${MC_VERSION}\"\r\n  echo -e \"build type: ${BUILD_TYPE}\"\r\n\r\n  ## some variables for getting versions and things\r\n  FILE_SITE=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\/\r\n  VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" --arg BUILD_TYPE \"${BUILD_TYPE}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains($BUILD_TYPE))')\r\n\r\n  ## locating the forge version\r\n  if [[ \"${VERSION_KEY}\" == \"\" ]] && [[ \"${BUILD_TYPE}\" == \"recommended\" ]]; then\r\n    echo -e \"dropping back to latest from recommended due to there not being a recommended version of forge for the mc version requested.\"\r\n    VERSION_KEY=$(echo -e ${JSON_DATA} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.promos | del(.\"latest-1.7.10\") | del(.\"1.7.10-latest-1.7.10\") | to_entries[] | .key | select(contains($MC_VERSION)) | select(contains(\"latest\"))')\r\n  fi\r\n\r\n  ## Error if the mc version set wasn't valid.\r\n  if [ \"${VERSION_KEY}\" == \"\" ] || [ \"${VERSION_KEY}\" == \"null\" ]; then\r\n    echo -e \"The install failed because there is no valid version of forge for the version of minecraft selected.\"\r\n    exit 1\r\n  fi\r\n\r\n  FORGE_VERSION=$(echo -e ${JSON_DATA} | jq -r --arg VERSION_KEY \"$VERSION_KEY\" '.promos | .[$VERSION_KEY]')\r\n\r\n  if [[ \"${MC_VERSION}\" == \"1.7.10\" ]] || [[ \"${MC_VERSION}\" == \"1.8.9\" ]]; then\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}.jar\r\n    if [[ \"${MC_VERSION}\" == \"1.7.10\" ]]; then\r\n      FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}-${MC_VERSION}-universal.jar\r\n    fi\r\n  else\r\n    DOWNLOAD_LINK=${FILE_SITE}${MC_VERSION}-${FORGE_VERSION}\/forge-${MC_VERSION}-${FORGE_VERSION}\r\n    FORGE_JAR=forge-${MC_VERSION}-${FORGE_VERSION}.jar\r\n  fi\r\nfi\r\n\r\n#Adding .jar when not eding by SERVER_JARFILE\r\nif [[ ! $SERVER_JARFILE = *\\.jar ]]; then\r\n  SERVER_JARFILE=\"$SERVER_JARFILE.jar\"\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Downloading forge version ${FORGE_VERSION}\"\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\n\r\nif [[ ! -z \"${DOWNLOAD_LINK}\" ]]; then\r\n  if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-installer.jar; then\r\n    echo -e \"installer jar download link is valid.\"\r\n  else\r\n    echo -e \"link is invalid. Exiting now\"\r\n    exit 2\r\n  fi\r\nelse\r\n  echo -e \"no download link provided. Exiting now\"\r\n  exit 3\r\nfi\r\n\r\ncurl -s -o installer.jar -sS ${DOWNLOAD_LINK}-installer.jar\r\n\r\n#Checking if downloaded jars exist\r\nif [[ ! -f .\/installer.jar ]]; then\r\n  echo \"!!! Error downloading forge version ${FORGE_VERSION} !!!\"\r\n  exit\r\nfi\r\n\r\nfunction  unix_args {\r\n  echo -e \"Detected Forge 1.17 or newer version. Setting up forge unix args.\"\r\n  ln -sf libraries\/net\/minecraftforge\/forge\/*\/unix_args.txt unix_args.txt\r\n}\r\n\r\n# Delete args to support downgrading\/upgrading\r\nrm -rf libraries\/net\/minecraftforge\/forge\r\nrm unix_args.txt\r\n\r\n#Installing server\r\necho -e \"Installing forge server.\\n\"\r\njava -jar installer.jar --installServer || { echo -e \"install failed using Forge version ${FORGE_VERSION} and Minecraft version ${MINECRAFT_VERSION}\"; exit 4; }\r\n\r\n# Check if we need a symlink for 1.17+ Forge JPMS args\r\nif [[ $MC_VERSION =~ ^1\\.(17|18|19|20|21|22|23) || $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n  unix_args\r\n\r\n# Check if someone has set MC to latest but overwrote it with older Forge version, otherwise we would have false positives\r\nelif [[ $MC_VERSION == \"latest\" && $FORGE_VERSION =~ ^1\\.(17|18|19|20|21|22|23) ]]; then\r\n  unix_args\r\nelse\r\n  # For versions below 1.17 that ship with jar\r\n  mv $FORGE_JAR $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Deleting installer.jar file.\\n\"\r\nrm -rf installer.jar",
             "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }
@@ -35,7 +37,7 @@
     "variables": [
         {
             "name": "Server Jar File",
-            "description": "The name of the Jarfile to use when running Forge Mod.",
+            "description": "The name of the Jarfile to use when running Forge version below 1.17.",
             "env_variable": "SERVER_JARFILE",
             "default_value": "server.jar",
             "user_viewable": true,
@@ -58,7 +60,7 @@
             "default_value": "recommended",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:20"
+            "rules": "required|string|in:recommended,latest"
         },
         {
             "name": "Forge Version",
@@ -67,7 +69,7 @@
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "nullable|string|max:20"
+            "rules": "nullable|string|max:25"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/database/Seeders/eggs/minecraft/egg-paper.json b/database/Seeders/eggs/minecraft/egg-paper.json
index 4153227a4..afd3715d8 100644
--- a/database/Seeders/eggs/minecraft/egg-paper.json
+++ b/database/Seeders/eggs/minecraft/egg-paper.json
@@ -4,23 +4,25 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-01T03:54:45+03:00",
+    "exported_at": "2021-11-14T19:21:07+00:00",
     "name": "Paper",
     "author": "parker@pterodactyl.io",
     "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.",
     "features": [
         "eula",
-        "java_version"
+        "java_version",
+        "pid_limit"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \"\r\n}",
         "logs": "{}",
         "stop": "stop"
diff --git a/database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json b/database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json
index c25fda1c2..908c1f4e5 100644
--- a/database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json
+++ b/database/Seeders/eggs/minecraft/egg-sponge--sponge-vanilla.json
@@ -4,13 +4,14 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-01T03:55:24+03:00",
+    "exported_at": "2021-10-22T19:19:17+02:00",
     "name": "Sponge (SpongeVanilla)",
     "author": "support@pterodactyl.io",
     "description": "SpongeVanilla is the SpongeAPI implementation for Vanilla Minecraft.",
     "features": [
         "eula",
-        "java_version"
+        "java_version",
+        "pid_limit"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
@@ -20,7 +21,7 @@
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \"\r\n}",
         "logs": "{}",
         "stop": "stop"
diff --git a/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json b/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
index 236a0cff3..2361a2974 100644
--- a/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
+++ b/database/Seeders/eggs/minecraft/egg-vanilla-minecraft.json
@@ -4,25 +4,27 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-04T19:19:24-04:00",
+    "exported_at": "2021-11-14T19:18:30+00:00",
     "name": "Vanilla Minecraft",
     "author": "support@pterodactyl.io",
     "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.",
     "features": [
         "eula",
-        "java_version"
+        "java_version",
+        "pid_limit"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \"\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "logs": "{}",
         "stop": "stop"
     },
     "scripts": {
diff --git a/database/Seeders/eggs/rust/egg-rust.json b/database/Seeders/eggs/rust/egg-rust.json
index 70eaadbad..ddbf88cdb 100644
--- a/database/Seeders/eggs/rust/egg-rust.json
+++ b/database/Seeders/eggs/rust/egg-rust.json
@@ -4,26 +4,28 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-05-29T19:02:43-04:00",
+    "exported_at": "2022-01-18T11:44:55-05:00",
     "name": "Rust",
     "author": "support@pterodactyl.io",
     "description": "The only aim in Rust is to survive. To do this you will need to overcome struggles such as hunger, thirst and cold. Build a fire. Build a shelter. Kill animals for meat. Protect yourself from other players, and kill them for meat. Create alliances with other players and form a town. Do whatever it takes to survive.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/pterodactyl\/core:rust"
     ],
     "file_denylist": [],
-    "startup": ".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.logoimage \\\"{{SERVER_LOGO}}\\\" +server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} +app.port {{APP_PORT}} {{ADDITIONAL_ARGS}}",
+    "startup": ".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.port {{RCON_PORT}} +rcon.web true +server.hostname \\\"{{HOSTNAME}}\\\" +server.level \\\"{{LEVEL}}\\\" +server.description \\\"{{DESCRIPTION}}\\\" +server.url \\\"{{SERVER_URL}}\\\" +server.headerimage \\\"{{SERVER_IMG}}\\\" +server.logoimage \\\"{{SERVER_LOGO}}\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} +app.port {{APP_PORT}}  $( [ -z ${MAP_URL} ] && printf %s \"+server.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"{{WORLD_SEED}}\\\"\" || printf %s \"+server.levelurl {{MAP_URL}}\" ) {{ADDITIONAL_ARGS}}",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"Server startup complete\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Server startup complete\"\r\n}",
+        "logs": "{}",
         "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\nSRCDS_APPID=258550\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nSRCDS_APPID=258550\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
+            "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -162,6 +164,15 @@
             "user_viewable": true,
             "user_editable": true,
             "rules": "nullable|url"
+        },
+        {
+            "name": "Custom Map URL",
+            "description": "Overwrites the map with the one from the direct download URL. Invalid URLs will cause the server to crash.",
+            "env_variable": "MAP_URL",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|url"
         }
     ]
 }
diff --git a/database/Seeders/eggs/source-engine/egg-ark--survival-evolved.json b/database/Seeders/eggs/source-engine/egg-ark--survival-evolved.json
index 012bf62f7..584ffe37c 100644
--- a/database/Seeders/eggs/source-engine/egg-ark--survival-evolved.json
+++ b/database/Seeders/eggs/source-engine/egg-ark--survival-evolved.json
@@ -4,11 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-09-11T14:35:10-04:00",
+    "exported_at": "2022-01-18T07:01:38-05:00",
     "name": "Ark: Survival Evolved",
     "author": "dev@shepper.fr",
     "description": "As a man or woman stranded, naked, freezing, and starving on the unforgiving shores of a mysterious island called ARK, use your skill and cunning to kill or tame and ride the plethora of leviathan dinosaurs and other primeval creatures roaming the land. Hunt, harvest resources, craft items, grow crops, research technologies, and build shelters to withstand the elements and store valuables, all while teaming up with (or preying upon) hundreds of other players to survive, dominate... and escape! \u2014 Gamepedia: ARK",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_source"
     ],
@@ -22,8 +24,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\r\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## create a symbolic link for loading mods\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\ncd \/mnt\/server",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\n\r\nmkdir -p \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## create a symbolic link for loading mods\r\ncd \/mnt\/server\/Engine\/Binaries\/ThirdParty\/SteamCMD\/Linux\r\nln -sf ..\/..\/..\/..\/..\/Steam\/steamapps steamapps\r\ncd \/mnt\/server",
+            "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -48,7 +50,7 @@
         },
         {
             "name": "Server Map",
-            "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis, CrystalIsles, Gen2",
+            "description": "Available Maps: TheIsland, TheCenter, Ragnarok, ScorchedEarth_P, Aberration_P, Extinction, Valguero_P, Genesis, CrystalIsles, Gen2, LostIsland",
             "env_variable": "SERVER_MAP",
             "default_value": "TheIsland",
             "user_viewable": true,
@@ -119,4 +121,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/database/Seeders/eggs/source-engine/egg-counter--strike--global-offensive.json b/database/Seeders/eggs/source-engine/egg-counter--strike--global-offensive.json
index a9371a3ea..7c9a9779f 100644
--- a/database/Seeders/eggs/source-engine/egg-counter--strike--global-offensive.json
+++ b/database/Seeders/eggs/source-engine/egg-counter--strike--global-offensive.json
@@ -4,11 +4,14 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-05T16:19:30-04:00",
+    "exported_at": "2022-01-18T07:01:54-05:00",
     "name": "Counter-Strike: Global Offensive",
     "author": "support@pterodactyl.io",
     "description": "Counter-Strike: Global Offensive is a multiplayer first-person shooter video game developed by Hidden Path Entertainment and Valve Corporation.",
-    "features": null,
+    "features": [
+        "gsl_token",
+        "steam_disk_space"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/games:source"
     ],
@@ -16,13 +19,13 @@
     "startup": ".\/srcds_run -game csgo -console -port {{SERVER_PORT}} +ip 0.0.0.0 +map {{SRCDS_MAP}} -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"Connection to Steam servers successful\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Connection to Steam servers successful\"\r\n}",
+        "logs": "{}",
         "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'ubuntu:18.04'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
             "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
diff --git a/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json b/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
index 881d31ec6..6c93175f5 100644
--- a/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
+++ b/database/Seeders/eggs/source-engine/egg-custom-source-engine-game.json
@@ -4,11 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-05T16:24:05-04:00",
+    "exported_at": "2022-01-18T07:03:08-05:00",
     "name": "Custom Source Engine Game",
     "author": "support@pterodactyl.io",
     "description": "This option allows modifying the startup arguments and other details to run a custom SRCDS based game on the panel.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/games:source"
     ],
@@ -16,13 +18,13 @@
     "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"gameserver Steam ID\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"gameserver Steam ID\"\r\n}",
+        "logs": "{}",
         "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
             "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
@@ -83,4 +85,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/database/Seeders/eggs/source-engine/egg-garrys-mod.json b/database/Seeders/eggs/source-engine/egg-garrys-mod.json
index 93de416a6..82ec08fee 100644
--- a/database/Seeders/eggs/source-engine/egg-garrys-mod.json
+++ b/database/Seeders/eggs/source-engine/egg-garrys-mod.json
@@ -4,11 +4,14 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-27T00:12:31-04:00",
+    "exported_at": "2022-01-18T07:04:20-05:00",
     "name": "Garrys Mod",
     "author": "support@pterodactyl.io",
     "description": "Garrys Mod, is a sandbox physics game created by Garry Newman, and developed by his company, Facepunch Studios.",
-    "features": null,
+    "features": [
+        "gsl_token",
+        "steam_disk_space"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/games:source"
     ],
@@ -22,7 +25,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl   \"\"\r\nsv_downloadurl  \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t    0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n# Creating needed default files for the game\r\ncd \/mnt\/server\/garrysmod\/lua\/autorun\/server\r\necho '\r\n-- Docs: https:\/\/wiki.garrysmod.com\/page\/resource\/AddWorkshop\r\n-- Place the ID of the workshop addon you want to be downloaded to people who join your server, not the collection ID\r\n-- Use https:\/\/beta.configcreator.com\/create\/gmod\/resources.lua to easily create a list based on your collection ID\r\n\r\nresource.AddWorkshop( \"\" )\r\n' > workshop.lua\r\n\r\ncd \/mnt\/server\/garrysmod\/cfg\r\necho '\r\n\/\/ Please do not set RCon in here, use the startup parameters.\r\n\r\nhostname\t\t\"New Gmod Server\"\r\nsv_password\t\t\"\"\r\nsv_loadingurl   \"\"\r\nsv_downloadurl  \"\"\r\n\r\n\/\/ Steam Server List Settings\r\n\/\/ sv_location \"eu\"\r\nsv_region \"255\"\r\nsv_lan \"0\"\r\nsv_max_queries_sec_global \"30000\"\r\nsv_max_queries_window \"45\"\r\nsv_max_queries_sec \"5\"\r\n\r\n\/\/ Server Limits\r\nsbox_maxprops\t\t100\r\nsbox_maxragdolls\t5\r\nsbox_maxnpcs\t\t10\r\nsbox_maxballoons\t10\r\nsbox_maxeffects\t\t10\r\nsbox_maxdynamite\t10\r\nsbox_maxlamps\t\t10\r\nsbox_maxthrusters\t10\r\nsbox_maxwheels\t\t10\r\nsbox_maxhoverballs\t10\r\nsbox_maxvehicles\t20\r\nsbox_maxbuttons\t\t10\r\nsbox_maxsents\t\t20\r\nsbox_maxemitters\t5\r\nsbox_godmode\t\t0\r\nsbox_noclip\t\t    0\r\n\r\n\/\/ Network Settings - Please keep these set to default.\r\n\r\nsv_minrate\t\t75000\r\nsv_maxrate\t\t0\r\ngmod_physiterations\t2\r\nnet_splitpacket_maxrate\t45000\r\ndecalfrequency\t\t12 \r\n\r\n\/\/ Execute Ban Files - Please do not edit\r\nexec banned_ip.cfg \r\nexec banned_user.cfg \r\n\r\n\/\/ Add custom lines under here\r\n' > server.cfg",
             "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
diff --git a/database/Seeders/eggs/source-engine/egg-insurgency.json b/database/Seeders/eggs/source-engine/egg-insurgency.json
index eed4b9e40..69d182f3d 100644
--- a/database/Seeders/eggs/source-engine/egg-insurgency.json
+++ b/database/Seeders/eggs/source-engine/egg-insurgency.json
@@ -4,11 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-06T10:34:11-04:00",
+    "exported_at": "2022-01-18T07:07:27-05:00",
     "name": "Insurgency",
     "author": "support@pterodactyl.io",
     "description": "Take to the streets for intense close quarters combat, where a team's survival depends upon securing crucial strongholds and destroying enemy supply in this multiplayer and cooperative Source Engine based experience.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/games:source"
     ],
@@ -17,12 +19,12 @@
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"gameserver Steam ID\"\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "logs": "{}",
         "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
             "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
@@ -47,4 +49,4 @@
             "rules": "required|regex:\/^(\\w{1,20})$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/database/Seeders/eggs/source-engine/egg-team-fortress2.json b/database/Seeders/eggs/source-engine/egg-team-fortress2.json
index c1bceaf89..6785984ed 100644
--- a/database/Seeders/eggs/source-engine/egg-team-fortress2.json
+++ b/database/Seeders/eggs/source-engine/egg-team-fortress2.json
@@ -4,25 +4,28 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-05T16:34:53-04:00",
+    "exported_at": "2022-01-30T14:09:22-05:00",
     "name": "Team Fortress 2",
     "author": "support@pterodactyl.io",
     "description": "Team Fortress 2 is a team-based first-person shooter multiplayer video game developed and published by Valve Corporation. It is the sequel to the 1996 mod Team Fortress for Quake and its 1999 remake.",
-    "features": null,
+    "features": [
+        "gsl_token",
+        "steam_disk_space"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/games:source"
     ],
     "file_denylist": [],
-    "startup": ".\/srcds_run -game tf -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
+    "startup": ".\/srcds_run -game tf -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart +sv_setsteamaccount {{STEAM_ACC}}",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"gameserver Steam ID\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"gameserver Steam ID\"\r\n}",
+        "logs": "{}",
         "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# Image to install with is 'debian:buster-slim'\r\n\r\n##\r\n#\r\n# Variables\r\n# STEAM_USER, STEAM_PASS, STEAM_AUTH - Steam user setup. If a user has 2fa enabled it will most likely fail due to timeout. Leave blank for anon install.\r\n# WINDOWS_INSTALL - if it's a windows server you want to install set to 1\r\n# SRCDS_APPID - steam app id ffound here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# EXTRA_FLAGS - when a server has extra glas for things like beta installs or updates.\r\n#\r\n##\r\n\r\n## just in case someone removed the defaults.\r\nif [ \"${STEAM_USER}\" == \"\" ]; then\r\n    echo -e \"steam user is not set.\\n\"\r\n    echo -e \"Using anonymous user.\\n\"\r\n    STEAM_USER=anonymous\r\n    STEAM_PASS=\"\"\r\n    STEAM_AUTH=\"\"\r\nelse\r\n    echo -e \"user set to ${STEAM_USER}\"\r\nfi\r\n\r\n## download and install steamcmd\r\ncd \/tmp\r\nmkdir -p \/mnt\/server\/steamcmd\r\ncurl -sSL -o steamcmd.tar.gz https:\/\/steamcdn-a.akamaihd.net\/client\/installer\/steamcmd_linux.tar.gz\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\nmkdir -p \/mnt\/server\/steamapps # Fix steamcmd disk write error when this folder is missing\r\ncd \/mnt\/server\/steamcmd\r\n\r\n# SteamCMD fails otherwise for some reason, even running as root.\r\n# This is changed at the end of the install process anyways.\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## install game using steamcmd\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ \"${WINDOWS_INSTALL}\" == \"1\" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6\r\n\r\n## set up 32 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so",
             "container": "ghcr.io\/pterodactyl\/installers:debian",
             "entrypoint": "bash"
         }
@@ -45,6 +48,15 @@
             "user_viewable": true,
             "user_editable": true,
             "rules": "required|regex:\/^(\\w{1,20})$\/"
+        },
+        {
+            "name": "Steam",
+            "description": "The Steam Game Server Login Token to display servers publicly. Generate one at https:\/\/steamcommunity.com\/dev\/managegameservers",
+            "env_variable": "STEAM_ACC",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|alpha_num|size:32"
         }
     ]
 }
diff --git a/database/migrations/2021_10_23_185304_drop_config_logs_column_from_eggs_table.php b/database/migrations/2021_10_23_185304_drop_config_logs_column_from_eggs_table.php
new file mode 100644
index 000000000..aa9e7511c
--- /dev/null
+++ b/database/migrations/2021_10_23_185304_drop_config_logs_column_from_eggs_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropConfigLogsColumnFromEggsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('eggs', function (Blueprint $table) {
+            $table->dropColumn('config_logs');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('eggs', function (Blueprint $table) {
+            $table->text('config_logs')->nullable()->after('docker_image');
+        });
+    }
+}
diff --git a/database/migrations/2021_10_23_202643_update_default_values_for_eggs.php b/database/migrations/2021_10_23_202643_update_default_values_for_eggs.php
new file mode 100644
index 000000000..b35fe83e9
--- /dev/null
+++ b/database/migrations/2021_10_23_202643_update_default_values_for_eggs.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateDefaultValuesForEggs extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('eggs', function (Blueprint $table) {
+            $table->string('script_container')->default('ghcr.io/pterodactyl/installers:alpine')->after('startup')->change();
+            $table->string('script_entry')->default('/bin/ash')->after('copy_script_from')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('eggs', function (Blueprint $table) {
+            // You are stuck with the new values because I am too lazy to revert them :)
+        });
+    }
+}
diff --git a/database/migrations/2021_11_01_180130_make_startup_field_nullable_on_servers_table.php b/database/migrations/2021_11_01_180130_make_startup_field_nullable_on_servers_table.php
new file mode 100644
index 000000000..7cd0f1002
--- /dev/null
+++ b/database/migrations/2021_11_01_180130_make_startup_field_nullable_on_servers_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class MakeStartupFieldNullableOnServersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->text('startup')->default(null)->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->text('startup')->change();
+        });
+    }
+}
diff --git a/database/migrations/2022_01_25_030847_drop_google_analytics.php b/database/migrations/2022_01_25_030847_drop_google_analytics.php
new file mode 100644
index 000000000..5daf0bc39
--- /dev/null
+++ b/database/migrations/2022_01_25_030847_drop_google_analytics.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Migrations\Migration;
+
+class DropGoogleAnalytics extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        DB::table('settings')->where('key', 'settings::app:analytics')->delete();
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        DB::table('settings')->insert(
+            [
+            'key' => 'settings::app:analytics',
+            ]
+        );
+    }
+}
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index 42b02dbad..1a0159ffe 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -34,7 +34,7 @@ x-common:
 #
 services:
   database:
-    image: library/mysql:8.0
+    image: mariadb:10.5
     restart: always
     command: --default-authentication-plugin=mysql_native_password
     volumes:
@@ -57,7 +57,7 @@ services:
       - cache
     volumes:
       - "/srv/pterodactyl/var/:/app/var/"
-      - "/srv/pterodactyl/nginx/:/etc/nginx/conf.d/"
+      - "/srv/pterodactyl/nginx/:/etc/nginx/http.d/"
       - "/srv/pterodactyl/certs/:/etc/letsencrypt/"
       - "/srv/pterodactyl/logs/:/app/storage/logs"
     environment:
@@ -70,6 +70,7 @@ services:
       QUEUE_DRIVER: "redis"
       REDIS_HOST: "cache"
       DB_HOST: "database"
+      DB_PORT: "3306"
 networks:
   default:
     ipam:
diff --git a/package.json b/package.json
index b583f1d26..c7ed805f3 100644
--- a/package.json
+++ b/package.json
@@ -7,50 +7,49 @@
         "watch": "$npm_execpath cross-env NODE_ENV=development $npm_execpath webpack --watch --progress",
         "build": "$npm_execpath cross-env NODE_ENV=development $npm_execpath webpack --progress",
         "build:production": "$npm_execpath run clean && $npm_execpath cross-env NODE_ENV=production $npm_execpath webpack --mode production",
-        "serve": "$npm_execpath run clean && $npm_execpath cross-env PUBLIC_PATH=https://pterodactyl.test:8080 NODE_ENV=development $npm_execpath webpack-dev-server --host 0.0.0.0 --hot --https --key /etc/ssl/private/pterodactyl.test-key.pem --cert /etc/ssl/private/pterodactyl.test.pem"
+        "serve": "$npm_execpath run clean && $npm_execpath cross-env WEBPACK_PUBLIC_PATH=/webpack@hmr/ NODE_ENV=development $npm_execpath webpack-dev-server --host 0.0.0.0 --port 8080 --public https://pterodactyl.test --hot"
     },
     "dependencies": {
-        "@": "link:./resources/scripts",
-        "@codemirror/autocomplete": "^0.19.3",
+        "@codemirror/autocomplete": "^0.19.0",
         "@codemirror/closebrackets": "^0.19.0",
-        "@codemirror/commands": "^0.19.2",
+        "@codemirror/commands": "^0.19.0",
         "@codemirror/comment": "^0.19.0",
         "@codemirror/fold": "^0.19.0",
-        "@codemirror/gutter": "^0.19.1",
-        "@codemirror/highlight": "^0.19.4",
+        "@codemirror/gutter": "^0.19.0",
+        "@codemirror/highlight": "^0.19.0",
         "@codemirror/history": "^0.19.0",
-        "@codemirror/lang-cpp": "^0.19.1",
-        "@codemirror/lang-css": "^0.19.1",
-        "@codemirror/lang-html": "^0.19.1",
-        "@codemirror/lang-java": "^0.19.1",
-        "@codemirror/lang-javascript": "^0.19.1",
-        "@codemirror/lang-json": "^0.19.1",
-        "@codemirror/lang-markdown": "^0.19.1",
-        "@codemirror/lang-rust": "^0.19.1",
-        "@codemirror/lang-sql": "^0.19.3",
-        "@codemirror/lang-xml": "^0.19.1",
-        "@codemirror/language": "^0.19.2",
+        "@codemirror/lang-cpp": "^0.19.0",
+        "@codemirror/lang-css": "^0.19.0",
+        "@codemirror/lang-html": "^0.19.0",
+        "@codemirror/lang-java": "^0.19.0",
+        "@codemirror/lang-javascript": "^0.19.0",
+        "@codemirror/lang-json": "^0.19.0",
+        "@codemirror/lang-markdown": "^0.19.0",
+        "@codemirror/lang-rust": "^0.19.0",
+        "@codemirror/lang-sql": "^0.19.0",
+        "@codemirror/lang-xml": "^0.19.0",
+        "@codemirror/language": "^0.19.0",
         "@codemirror/legacy-modes": "^0.19.0",
         "@codemirror/lint": "^0.19.0",
-        "@codemirror/matchbrackets": "^0.19.1",
+        "@codemirror/matchbrackets": "^0.19.0",
         "@codemirror/rectangular-selection": "^0.19.0",
         "@codemirror/search": "^0.19.0",
-        "@codemirror/state": "^0.19.1",
-        "@codemirror/stream-parser": "^0.19.1",
-        "@codemirror/theme-one-dark": "^0.19.0",
-        "@codemirror/view": "^0.19.4",
+        "@codemirror/state": "^0.19.0",
+        "@codemirror/stream-parser": "^0.19.0",
+        "@codemirror/view": "^0.19.0",
         "@fortawesome/fontawesome-svg-core": "^1.2.36",
         "@fortawesome/free-brands-svg-icons": "^5.15.4",
         "@fortawesome/free-regular-svg-icons": "^5.15.4",
         "@fortawesome/free-solid-svg-icons": "^5.15.4",
-        "@fortawesome/react-fontawesome": "^0.1.15",
+        "@fortawesome/react-fontawesome": "^0.1.16",
+        "@heroicons/react": "^1.0.5",
         "@hot-loader/react-dom": "^16.14.0",
         "axios": "^0.21.4",
         "chart.js": "^2.9.4",
-        "date-fns": "^2.23.0",
+        "date-fns": "^2.25.0",
         "debounce": "^1.2.1",
         "deepmerge": "^4.2.2",
-        "easy-peasy": "^5.0.3",
+        "easy-peasy": "^5.0.4",
         "events": "^3.3.0",
         "feature": "link:./resources/scripts/components/server/features",
         "formik": "^2.2.9",
@@ -68,85 +67,85 @@
         "react-ga": "^3.3.0",
         "react-google-recaptcha": "^2.1.0",
         "react-hot-loader": "^4.13.0",
-        "react-i18next": "^11.11.4",
+        "react-i18next": "^11.14.2",
         "react-router": "^5.2.1",
-        "react-router-dom": "^5.2.1",
+        "react-router-dom": "^5.3.0",
         "react-select": "^4.3.1",
         "react-transition-group": "^4.4.2",
         "reaptcha": "^1.7.3",
         "sockette": "^2.0.6",
-        "styled-components": "^5.3.1",
+        "styled-components": "^5.3.3",
         "styled-components-breakpoint": "^3.0.0-preview.20",
         "swr": "^1.0.1",
         "uuid": "^3.4.0",
-        "xterm": "^4.14.1",
+        "xterm": "^4.15.0",
         "xterm-addon-attach": "^0.6.0",
         "xterm-addon-fit": "^0.5.0",
         "xterm-addon-search": "^0.8.1",
         "xterm-addon-search-bar": "^0.2.0",
         "xterm-addon-web-links": "^0.4.0",
-        "yup": "^0.32.9"
+        "yup": "^0.32.11"
     },
     "devDependencies": {
-        "@babel/core": "^7.14.5",
-        "@babel/plugin-proposal-class-properties": "^7.14.5",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
-        "@babel/plugin-proposal-object-rest-spread": "^7.14.5",
-        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/core": "^7.16.0",
+        "@babel/plugin-proposal-class-properties": "^7.16.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.0",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@babel/plugin-transform-react-jsx": "^7.14.5",
-        "@babel/plugin-transform-runtime": "^7.14.5",
-        "@babel/preset-env": "^7.14.5",
-        "@babel/preset-react": "^7.14.5",
-        "@babel/preset-typescript": "^7.14.5",
-        "@babel/runtime": "^7.14.5",
-        "@tailwindcss/forms": "^0.3.3",
+        "@babel/plugin-transform-react-jsx": "^7.16.0",
+        "@babel/plugin-transform-runtime": "^7.16.0",
+        "@babel/preset-env": "^7.16.0",
+        "@babel/preset-react": "^7.16.0",
+        "@babel/preset-typescript": "^7.16.0",
+        "@babel/runtime": "^7.16.3",
+        "@tailwindcss/forms": "^0.3.4",
         "@types/chart.js": "^2.9.34",
-        "@types/debounce": "^1.2.0",
+        "@types/debounce": "^1.2.1",
         "@types/events": "^3.0.0",
         "@types/history": "^4.7.9",
-        "@types/node": "^16.9.1",
+        "@types/node": "^16.11.7",
         "@types/qrcode.react": "^1.0.2",
         "@types/query-string": "^6.3.0",
-        "@types/react": "^16.14.15",
-        "@types/react-copy-to-clipboard": "^5.0.1",
+        "@types/react": "^16.14.20",
+        "@types/react-copy-to-clipboard": "^5.0.2",
         "@types/react-dom": "^16.9.14",
-        "@types/react-redux": "^7.1.18",
-        "@types/react-router": "^5.1.16",
-        "@types/react-router-dom": "^5.1.8",
-        "@types/react-select": "^4.0.17",
-        "@types/react-transition-group": "^4.4.2",
-        "@types/styled-components": "^5.1.14",
+        "@types/react-redux": "^7.1.20",
+        "@types/react-router": "^5.1.17",
+        "@types/react-router-dom": "^5.3.2",
+        "@types/react-select": "^4.0.18",
+        "@types/react-transition-group": "^4.4.4",
+        "@types/styled-components": "^5.1.15",
         "@types/uuid": "^3.4.10",
-        "@types/webappsec-credential-management": "^0.6.1",
-        "@types/webpack-env": "^1.16.2",
+        "@types/webappsec-credential-management": "^0.6.2",
+        "@types/webpack-env": "^1.16.3",
         "@types/yup": "^0.29.13",
-        "@typescript-eslint/eslint-plugin": "^4.30.0",
-        "@typescript-eslint/parser": "^4.30.0",
-        "autoprefixer": "^10.3.4",
-        "babel-loader": "^8.2.2",
+        "@typescript-eslint/eslint-plugin": "^4.33.0",
+        "@typescript-eslint/parser": "^4.33.0",
+        "autoprefixer": "^10.4.0",
+        "babel-loader": "^8.2.3",
         "babel-plugin-macros": "^3.1.0",
-        "babel-plugin-styled-components": "^1.13.2",
-        "browserslist": "^4.17.0",
+        "babel-plugin-styled-components": "^1.13.3",
+        "browserslist": "^4.17.6",
         "cross-env": "^7.0.3",
         "css-loader": "^5.2.7",
         "eslint": "^7.32.0",
         "eslint-config-standard": "^16.0.3",
-        "eslint-plugin-import": "^2.23.4",
+        "eslint-plugin-import": "^2.25.3",
         "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-promise": "^5.1.0",
-        "eslint-plugin-react": "^7.24.0",
-        "eslint-plugin-react-hooks": "^4.2.0",
-        "fork-ts-checker-webpack-plugin": "^6.3.3",
-        "postcss": "^8.3.6",
+        "eslint-plugin-promise": "^5.1.1",
+        "eslint-plugin-react": "^7.27.0",
+        "eslint-plugin-react-hooks": "^4.3.0",
+        "fork-ts-checker-webpack-plugin": "^6.4.0",
+        "postcss": "^8.3.11",
         "redux-devtools-extension": "^2.13.9",
         "source-map-loader": "^1.1.3",
         "style-loader": "^2.0.0",
         "svg-url-loader": "^7.1.1",
         "tailwindcss": "^2.2.7",
         "terser-webpack-plugin": "^4.2.3",
-        "twin.macro": "^2.7.0",
-        "typescript": "^4.4.3",
+        "twin.macro": "^2.8.1",
+        "typescript": "^4.4.4",
         "webpack": "^4.46.0",
         "webpack-assets-manifest": "^4.0.6",
         "webpack-bundle-analyzer": "^4.4.2",
@@ -170,8 +169,8 @@
         },
         "styledComponents": {
             "pure": true,
-            "displayName": false,
-            "fileName": false
+            "displayName": true,
+            "fileName": true
         }
     },
     "packageManager": "yarn@3.0.2"
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
new file mode 100644
index 000000000..c26650da5
--- /dev/null
+++ b/phpstan-baseline.neon
@@ -0,0 +1,257 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$string of function strtoupper expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/AppSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|false\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/AppSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/AppSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function strtoupper expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/DatabaseSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|false\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/DatabaseSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/DatabaseSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function strtoupper expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/EmailSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function studly_case expects string, array\\|bool\\|string given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/EmailSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|false\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/EmailSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Environment/EmailSettingsCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$action of method Pterodactyl\\\\Repositories\\\\Wings\\\\DaemonPowerRepository\\:\\:send\\(\\) expects string, array\\|string\\|null given\\.$#"
+			count: 1
+			path: app/Console/Commands/Server/BulkPowerActionCommand.php
+
+		-
+			message: "#^Parameter \\#2 \\$string of function explode expects string, array\\|bool\\|string given\\.$#"
+			count: 2
+			path: app/Console/Commands/Server/BulkPowerActionCommand.php
+
+		-
+			message: "#^Binary operation \"\\.\" between 'download/v' and array\\|bool\\|string\\|null results in an error\\.$#"
+			count: 1
+			path: app/Console/Commands/UpgradeCommand.php
+
+		-
+			message: "#^Cannot access offset 'name' on array\\|false\\.$#"
+			count: 2
+			path: app/Console/Commands/UpgradeCommand.php
+
+		-
+			message: "#^Method Pterodactyl\\\\Console\\\\Commands\\\\UpgradeCommand\\:\\:getUrl\\(\\) should return string but returns array\\|bool\\|string\\|null\\.$#"
+			count: 1
+			path: app/Console/Commands/UpgradeCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$group_id of function posix_getgrgid expects int, int\\|false given\\.$#"
+			count: 1
+			path: app/Console/Commands/UpgradeCommand.php
+
+		-
+			message: "#^Parameter \\#1 \\$user_id of function posix_getpwuid expects int, int\\|false given\\.$#"
+			count: 1
+			path: app/Console/Commands/UpgradeCommand.php
+
+		-
+			message: "#^Binary operation \"\\.\" between array\\|string and '\\.' results in an error\\.$#"
+			count: 1
+			path: app/Exceptions/Handler.php
+
+		-
+			message: "#^Possibly invalid array key type array\\|string\\.$#"
+			count: 1
+			path: app/Exceptions/Handler.php
+
+		-
+			message: "#^Unable to resolve the template type TReturn in call to method Illuminate\\\\Support\\\\Collection\\<mixed,array\\<int, mixed\\>\\>\\:\\:flatMap\\(\\)$#"
+			count: 1
+			path: app/Exceptions/Handler.php
+
+		-
+			message: "#^Possibly invalid array key type array\\<string\\>\\|string\\.$#"
+			count: 1
+			path: app/Extensions/Backups/BackupManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$message of static method Illuminate\\\\Log\\\\Logger\\:\\:info\\(\\) expects string, string\\|false given\\.$#"
+			count: 2
+			path: app/Http/Controllers/Api/Application/Eggs/EggController.php
+
+		-
+			message: "#^Parameter \\#2 \\$content of method Pterodactyl\\\\Services\\\\Eggs\\\\Sharing\\\\EggImporterService\\:\\:handleContent\\(\\) expects string, resource\\|string given\\.$#"
+			count: 1
+			path: app/Http/Controllers/Api/Application/Nests/NestController.php
+
+		-
+			message: "#^Parameter \\#1 \\$perPage of method Illuminate\\\\Database\\\\Eloquent\\\\Relations\\\\HasMany\\<Pterodactyl\\\\Models\\\\Backup\\>\\:\\:paginate\\(\\) expects int\\|null, array\\|int\\|string given\\.$#"
+			count: 1
+			path: app/Http/Controllers/Api/Client/Servers/BackupController.php
+
+		-
+			message: "#^Parameter \\#2 \\$content of method Pterodactyl\\\\Repositories\\\\Wings\\\\DaemonFileRepository\\:\\:putContent\\(\\) expects string, resource\\|string given\\.$#"
+			count: 1
+			path: app/Http/Controllers/Api/Client/Servers/FileController.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function md5 expects string, string\\|false given\\.$#"
+			count: 1
+			path: app/Http/Controllers/Base/LocaleController.php
+
+		-
+			message: "#^Parameter \\#1 \\$key of method Illuminate\\\\Routing\\\\Router\\:\\:bind\\(\\) expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Http/Middleware/Api/Application/SubstituteApplicationApiBindings.php
+
+		-
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, resource\\|string given\\.$#"
+			count: 1
+			path: app/Http/Middleware/Api/IsValidJson.php
+
+		-
+			message: "#^Parameter \\#1 \\$array of function array_get expects array\\|ArrayAccess, array\\<string, int\\|string\\>\\|false given\\.$#"
+			count: 1
+			path: app/Http/Middleware/VerifyReCaptcha.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function snake_case expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php
+
+		-
+			message: "#^Method Pterodactyl\\\\Jobs\\\\Schedule\\\\RunTaskJob\\:\\:__construct\\(\\) has parameter \\$manualRun with no typehint specified\\.$#"
+			count: 1
+			path: app/Jobs/Schedule/RunTaskJob.php
+
+		-
+			message: "#^Parameter \\#2 \\$column of static method Illuminate\\\\Validation\\\\Rule\\:\\:unique\\(\\) expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Models/Model.php
+
+		-
+			message: "#^Method Pterodactyl\\\\Models\\\\Node\\:\\:getJsonConfiguration\\(\\) should return string but returns string\\|false\\.$#"
+			count: 1
+			path: app/Models/Node.php
+
+		-
+			message: "#^Method Pterodactyl\\\\Repositories\\\\Eloquent\\\\EloquentRepository\\:\\:updateOrCreate\\(\\) should return Illuminate\\\\Database\\\\Eloquent\\\\Model but returns bool\\|Illuminate\\\\Database\\\\Eloquent\\\\Model\\.$#"
+			count: 1
+			path: app/Repositories/Eloquent/EloquentRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\.\\.\\.\\$model of method Pterodactyl\\\\Repositories\\\\Repository\\:\\:initializeModel\\(\\) expects class\\-string\\<Illuminate\\\\Database\\\\Eloquent\\\\Model\\>, mixed given\\.$#"
+			count: 1
+			path: app/Repositories/Repository.php
+
+		-
+			message: "#^Parameter \\#2 \\$content of method Pterodactyl\\\\Services\\\\Eggs\\\\Sharing\\\\EggImporterService\\:\\:handleContent\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: app/Services/Eggs/Sharing/EggImporterService.php
+
+		-
+			message: "#^Parameter \\#1 \\$json of function json_decode expects string, string\\|false given\\.$#"
+			count: 1
+			path: app/Services/Eggs/Sharing/EggUpdateImporterService.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of static method Illuminate\\\\Support\\\\Str\\:\\:snake\\(\\) expects string, array\\|string given\\.$#"
+			count: 1
+			path: app/Services/Eggs/Variables/VariableCreationService.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of static method Illuminate\\\\Support\\\\Str\\:\\:snake\\(\\) expects string, array\\|string given\\.$#"
+			count: 1
+			path: app/Services/Eggs/Variables/VariableUpdateService.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function substr expects string, string\\|false given\\.$#"
+			count: 1
+			path: app/Services/Helpers/SoftwareVersionService.php
+
+		-
+			message: "#^Parameter \\#2 \\$string of function explode expects string, string\\|false given\\.$#"
+			count: 1
+			path: app/Services/Helpers/SoftwareVersionService.php
+
+		-
+			message: "#^Parameter \\#1 \\$id of method Lcobucci\\\\JWT\\\\Builder\\:\\:identifiedBy\\(\\) expects string, string\\|false given\\.$#"
+			count: 1
+			path: app/Services/Nodes/NodeJWTService.php
+
+		-
+			message: "#^Parameter \\#1 \\$name of method Lcobucci\\\\JWT\\\\Builder\\:\\:withClaim\\(\\) expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Services/Nodes/NodeJWTService.php
+
+		-
+			message: "#^Parameter \\#1 \\$key of method Illuminate\\\\Database\\\\Eloquent\\\\Model\\:\\:setAttribute\\(\\) expects string, int\\|string given\\.$#"
+			count: 1
+			path: app/Services/Servers/ServerConfigurationStructureService.php
+
+		-
+			message: "#^Access to an undefined property Illuminate\\\\Database\\\\Eloquent\\\\Collection\\<Pterodactyl\\\\Models\\\\Allocation\\>\\|Pterodactyl\\\\Models\\\\Allocation\\:\\:\\$node_id\\.$#"
+			count: 1
+			path: app/Services/Servers/ServerCreationService.php
+
+		-
+			message: "#^Access to an undefined property Illuminate\\\\Database\\\\Eloquent\\\\Collection\\<Pterodactyl\\\\Models\\\\Egg\\>\\|Pterodactyl\\\\Models\\\\Egg\\:\\:\\$nest_id\\.$#"
+			count: 1
+			path: app/Services/Servers/ServerCreationService.php
+
+		-
+			message: "#^Parameter \\#3 \\$subject of function preg_replace expects array\\|string, string\\|false given\\.$#"
+			count: 1
+			path: app/Services/Subusers/SubuserCreationService.php
+
+		-
+			message: "#^Parameter \\#1 \\$string of function urlencode expects string, array\\|string\\|null given\\.$#"
+			count: 1
+			path: app/Services/Users/TwoFactorSetupService.php
+
+		-
+			message: "#^Cannot call method getResourceName\\(\\) on \\(callable&class\\-string\\)\\|\\(callable&object\\)\\|League\\\\Fractal\\\\TransformerAbstract\\.$#"
+			count: 2
+			path: app/Transformers/Api/Transformer.php
+
+		-
+			message: "#^Cannot call method setTimezone\\(\\) on Carbon\\\\CarbonImmutable\\|false\\.$#"
+			count: 1
+			path: app/Transformers/Api/Transformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object_or_class of function method_exists expects object\\|string, \\(callable\\)\\|League\\\\Fractal\\\\TransformerAbstract given\\.$#"
+			count: 2
+			path: app/Transformers/Api/Transformer.php
+
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 000000000..3fb3a5bb3
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,15 @@
+includes:
+    - ./phpstan-baseline.neon
+    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/phpstan/phpstan-webmozart-assert/extension.neon
+
+parameters:
+    paths:
+        - app
+        - database/Seeders
+    level: 7
+    ignoreErrors:
+        - '#Unsafe usage of new static#'
+        - '#has no return typehint specified.#'
+        - '#has no typehint specified.#'
+    checkMissingIterableValueType: false
diff --git a/phpunit.xml b/phpunit.xml
index 227dadb9e..a14cb82be 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -33,6 +33,7 @@
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="DB_CONNECTION" value="testing"/>
+        <env name="TESTING_DB_USERNAME" value="root"/>
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
diff --git a/public/robots.txt b/public/robots.txt
index eb0536286..1f53798bb 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Disallow: /
diff --git a/resources/scripts/api/admin/egg.ts b/resources/scripts/api/admin/egg.ts
new file mode 100644
index 000000000..4fd5e7844
--- /dev/null
+++ b/resources/scripts/api/admin/egg.ts
@@ -0,0 +1,97 @@
+import { Model, UUID, WithRelationships, withRelationships } from '@/api/admin/index';
+import { Nest } from '@/api/admin/nest';
+import http, { QueryBuilderParams, withQueryBuilderParams } from '@/api/http';
+import { AdminTransformers } from '@/api/admin/transformers';
+import { AxiosError } from 'axios';
+import { useRouteMatch } from 'react-router-dom';
+import useSWR, { SWRResponse } from 'swr';
+
+export interface Egg extends Model {
+    id: number;
+    uuid: UUID;
+    nestId: number;
+    author: string;
+    name: string;
+    description: string | null;
+    features: string[] | null;
+    dockerImages: string[];
+    configFiles: Record<string, any> | null;
+    configStartup: Record<string, any> | null;
+    configStop: string | null;
+    configFrom: number | null;
+    startup: string;
+    scriptContainer: string;
+    copyScriptFrom: number | null;
+    scriptEntry: string;
+    scriptIsPrivileged: boolean;
+    scriptInstall: string | null;
+    createdAt: Date;
+    updatedAt: Date;
+    relationships: {
+        nest?: Nest;
+        variables?: EggVariable[];
+    };
+}
+
+export interface EggVariable extends Model {
+    id: number;
+    eggId: number;
+    name: string;
+    description: string;
+    environmentVariable: string;
+    defaultValue: string;
+    isUserViewable: boolean;
+    isUserEditable: boolean;
+    // isRequired: boolean;
+    rules: string;
+    createdAt: Date;
+    updatedAt: Date;
+}
+
+/**
+ * A standard API response with the minimum viable details for the frontend
+ * to correctly render a egg.
+ */
+type LoadedEgg = WithRelationships<Egg, 'nest' | 'variables'>;
+
+/**
+ * Gets a single egg from the database and returns it.
+ */
+export const getEgg = async (id: number | string): Promise<LoadedEgg> => {
+    const { data } = await http.get(`/api/application/eggs/${id}`, {
+        params: {
+            include: [ 'nest', 'variables' ],
+        },
+    });
+
+    return withRelationships(AdminTransformers.toEgg(data), 'nest', 'variables');
+};
+
+export const searchEggs = async (nestId: number, params: QueryBuilderParams<'name'>): Promise<WithRelationships<Egg, 'variables'>[]> => {
+    const { data } = await http.get(`/api/application/nests/${nestId}/eggs`, {
+        params: {
+            ...withQueryBuilderParams(params),
+            include: [ 'variables' ],
+        },
+    });
+
+    return data.data.map(AdminTransformers.toEgg);
+};
+
+export const exportEgg = async (eggId: number): Promise<Record<string, any>> => {
+    const { data } = await http.get(`/api/application/eggs/${eggId}/export`);
+    return data;
+};
+
+/**
+ * Returns an SWR instance by automatically loading in the server for the currently
+ * loaded route match in the admin area.
+ */
+export const useEggFromRoute = (): SWRResponse<LoadedEgg, AxiosError> => {
+    const { params } = useRouteMatch<{ id: string }>();
+
+    return useSWR(`/api/application/eggs/${params.id}`, async () => getEgg(params.id), {
+        revalidateOnMount: false,
+        revalidateOnFocus: false,
+    });
+};
diff --git a/resources/scripts/api/admin/eggs/createEgg.ts b/resources/scripts/api/admin/eggs/createEgg.ts
index 5a2f8c964..0ad08d9ee 100644
--- a/resources/scripts/api/admin/eggs/createEgg.ts
+++ b/resources/scripts/api/admin/eggs/createEgg.ts
@@ -1,10 +1,12 @@
 import http from '@/api/http';
 import { Egg, rawDataToEgg } from '@/api/admin/eggs/getEgg';
 
-export default (egg: Partial<Egg>): Promise<Egg> => {
+type Egg2 = Omit<Omit<Partial<Egg>, 'configFiles'>, 'configStartup'> & { configFiles: string, configStartup: string };
+
+export default (egg: Partial<Egg2>): Promise<Egg> => {
     return new Promise((resolve, reject) => {
         http.post(
-            '/api/application/eggs/',
+            '/api/application/eggs',
             {
                 nest_id: egg.nestId,
                 name: egg.name,
diff --git a/resources/scripts/api/admin/eggs/createEggVariable.ts b/resources/scripts/api/admin/eggs/createEggVariable.ts
new file mode 100644
index 000000000..72f2c314d
--- /dev/null
+++ b/resources/scripts/api/admin/eggs/createEggVariable.ts
@@ -0,0 +1,22 @@
+import http from '@/api/http';
+import { EggVariable } from '@/api/admin/egg';
+import { AdminTransformers } from '@/api/admin/transformers';
+
+export type CreateEggVariable = Omit<EggVariable, 'id' | 'eggId' | 'createdAt' | 'updatedAt' | 'relationships'>;
+
+export default async (eggId: number, variable: CreateEggVariable): Promise<EggVariable> => {
+    const { data } = await http.post(
+        `/api/application/eggs/${eggId}/variables`,
+        {
+            name: variable.name,
+            description: variable.description,
+            env_variable: variable.environmentVariable,
+            default_value: variable.defaultValue,
+            user_viewable: variable.isUserViewable,
+            user_editable: variable.isUserEditable,
+            rules: variable.rules,
+        },
+    );
+
+    return AdminTransformers.toEggVariable(data);
+};
diff --git a/resources/scripts/api/admin/eggs/deleteEggVariable.ts b/resources/scripts/api/admin/eggs/deleteEggVariable.ts
new file mode 100644
index 000000000..967798f55
--- /dev/null
+++ b/resources/scripts/api/admin/eggs/deleteEggVariable.ts
@@ -0,0 +1,9 @@
+import http from '@/api/http';
+
+export default (eggId: number, variableId: number): Promise<void> => {
+    return new Promise((resolve, reject) => {
+        http.delete(`/api/application/eggs/${eggId}/variables/${variableId}`)
+            .then(() => resolve())
+            .catch(reject);
+    });
+};
diff --git a/resources/scripts/api/admin/eggs/getEgg.ts b/resources/scripts/api/admin/eggs/getEgg.ts
index 48e139301..5e380e113 100644
--- a/resources/scripts/api/admin/eggs/getEgg.ts
+++ b/resources/scripts/api/admin/eggs/getEgg.ts
@@ -1,6 +1,7 @@
 import { Nest } from '@/api/admin/nests/getNests';
 import { rawDataToServer, Server } from '@/api/admin/servers/getServers';
 import http, { FractalResponseData, FractalResponseList } from '@/api/http';
+import useSWR from 'swr';
 
 export interface EggVariable {
     id: number;
@@ -12,12 +13,11 @@ export interface EggVariable {
     userViewable: boolean;
     userEditable: boolean;
     rules: string;
-    required: boolean;
     createdAt: Date;
     updatedAt: Date;
 }
 
-const rawDataToEggVariable = ({ attributes }: FractalResponseData): EggVariable => ({
+export const rawDataToEggVariable = ({ attributes }: FractalResponseData): EggVariable => ({
     id: attributes.id,
     eggId: attributes.egg_id,
     name: attributes.name,
@@ -27,7 +27,6 @@ const rawDataToEggVariable = ({ attributes }: FractalResponseData): EggVariable
     userViewable: attributes.user_viewable,
     userEditable: attributes.user_editable,
     rules: attributes.rules,
-    required: attributes.required,
     createdAt: new Date(attributes.created_at),
     updatedAt: new Date(attributes.updated_at),
 });
@@ -90,10 +89,16 @@ export const rawDataToEgg = ({ attributes }: FractalResponseData): Egg => ({
     },
 });
 
-export default (id: number, include: string[] = []): Promise<Egg> => {
-    return new Promise((resolve, reject) => {
-        http.get(`/api/application/eggs/${id}`, { params: { include: include.join(',') } })
-            .then(({ data }) => resolve(rawDataToEgg(data)))
-            .catch(reject);
+export const getEgg = async (id: number): Promise<Egg> => {
+    const { data } = await http.get(`/api/application/eggs/${id}`, { params: { include: [ 'variables' ] } });
+
+    return rawDataToEgg(data);
+};
+
+export default (id: number) => {
+    return useSWR<Egg>(`egg:${id}`, async () => {
+        const { data } = await http.get(`/api/application/eggs/${id}`, { params: { include: [ 'variables' ] } });
+
+        return rawDataToEgg(data);
     });
 };
diff --git a/resources/scripts/api/admin/eggs/updateEggVariables.ts b/resources/scripts/api/admin/eggs/updateEggVariables.ts
new file mode 100644
index 000000000..b78273341
--- /dev/null
+++ b/resources/scripts/api/admin/eggs/updateEggVariables.ts
@@ -0,0 +1,21 @@
+import http from '@/api/http';
+import { EggVariable } from '@/api/admin/egg';
+import { AdminTransformers } from '@/api/admin/transformers';
+
+export default async (eggId: number, variables: Omit<EggVariable, 'eggId' | 'createdAt' | 'updatedAt'>[]): Promise<EggVariable[]> => {
+    const { data } = await http.patch(
+        `/api/application/eggs/${eggId}/variables`,
+        variables.map(variable => ({
+            id: variable.id,
+            name: variable.name,
+            description: variable.description,
+            env_variable: variable.environmentVariable,
+            default_value: variable.defaultValue,
+            user_viewable: variable.isUserViewable,
+            user_editable: variable.isUserEditable,
+            rules: variable.rules,
+        })),
+    );
+
+    return data.data.map(AdminTransformers.toEggVariable);
+};
diff --git a/resources/scripts/api/admin/index.ts b/resources/scripts/api/admin/index.ts
index 54161f2b0..014a207a7 100644
--- a/resources/scripts/api/admin/index.ts
+++ b/resources/scripts/api/admin/index.ts
@@ -1,5 +1,38 @@
 import { createContext } from 'react';
 
+export interface Model {
+    relationships: Record<string, unknown>;
+}
+
+export type UUID = string;
+
+/**
+ * Marks the provided relationships keys as present in the given model
+ * rather than being optional to improve typing responses.
+ */
+export type WithRelationships<M extends Model, R extends string> = Omit<M, 'relationships'> & {
+    relationships: Omit<M['relationships'], keyof R> & {
+        [K in R]: NonNullable<M['relationships'][K]>;
+    }
+}
+
+/**
+ * Helper type that allows you to infer the type of an object by giving
+ * it the specific API request function with a return type. For example:
+ *
+ * type EggT = InferModel<typeof getEgg>;
+ */
+export type InferModel<T extends (...args: any) => any> = ReturnType<T> extends Promise<infer U> ? U : T;
+
+/**
+ * Helper function that just returns the model you pass in, but types the model
+ * such that TypeScript understands the relationships on it. This is just to help
+ * reduce the amount of duplicated type casting all over the codebase.
+ */
+export const withRelationships = <M extends Model, R extends string> (model: M, ..._keys: R[]) => {
+    return model as unknown as WithRelationships<M, R>;
+};
+
 export interface ListContext<T> {
     page: number;
     setPage: (page: ((p: number) => number) | number) => void;
diff --git a/resources/scripts/api/admin/location.ts b/resources/scripts/api/admin/location.ts
new file mode 100644
index 000000000..82ff394f8
--- /dev/null
+++ b/resources/scripts/api/admin/location.ts
@@ -0,0 +1,13 @@
+import { Model } from '@/api/admin/index';
+import { Node } from '@/api/admin/node';
+
+export interface Location extends Model {
+    id: number;
+    short: string;
+    long: string;
+    createdAt: Date;
+    updatedAt: Date;
+    relationships: {
+        nodes?: Node[];
+    };
+}
diff --git a/resources/scripts/api/admin/nest.ts b/resources/scripts/api/admin/nest.ts
new file mode 100644
index 000000000..c808637fc
--- /dev/null
+++ b/resources/scripts/api/admin/nest.ts
@@ -0,0 +1,25 @@
+import { Model, UUID } from '@/api/admin/index';
+import { Egg } from '@/api/admin/egg';
+import http, { QueryBuilderParams, withQueryBuilderParams } from '@/api/http';
+import { AdminTransformers } from '@/api/admin/transformers';
+
+export interface Nest extends Model {
+    id: number;
+    uuid: UUID;
+    author: string;
+    name: string;
+    description?: string;
+    createdAt: Date;
+    updatedAt: Date;
+    relationships: {
+        eggs?: Egg[];
+    };
+}
+
+export const searchNests = async (params: QueryBuilderParams<'name'>): Promise<Nest[]> => {
+    const { data } = await http.get('/api/application/nests', {
+        params: withQueryBuilderParams(params),
+    });
+
+    return data.data.map(AdminTransformers.toNest);
+};
diff --git a/resources/scripts/api/admin/nests/searchEggs.ts b/resources/scripts/api/admin/nests/searchEggs.ts
deleted file mode 100644
index 8bb0f3185..000000000
--- a/resources/scripts/api/admin/nests/searchEggs.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import http from '@/api/http';
-import { Egg, rawDataToEgg } from '@/api/admin/eggs/getEgg';
-
-interface Filters {
-    name?: string;
-}
-
-export default (nestId: number, filters?: Filters, include: string[] = []): Promise<Egg[]> => {
-    const params = {};
-    if (filters !== undefined) {
-        Object.keys(filters).forEach(key => {
-            // @ts-ignore
-            params['filter[' + key + ']'] = filters[key];
-        });
-    }
-
-    return new Promise((resolve, reject) => {
-        http.get(`/api/application/nests/${nestId}/eggs`, { params: { include: include.join(','), ...params } })
-            .then(response => resolve(
-                (response.data.data || []).map(rawDataToEgg)
-            ))
-            .catch(reject);
-    });
-};
diff --git a/resources/scripts/api/admin/nests/searchNests.ts b/resources/scripts/api/admin/nests/searchNests.ts
deleted file mode 100644
index 65cc41f36..000000000
--- a/resources/scripts/api/admin/nests/searchNests.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import http from '@/api/http';
-import { Nest, rawDataToNest } from '@/api/admin/nests/getNests';
-
-interface Filters {
-    name?: string;
-}
-
-export default (filters?: Filters): Promise<Nest[]> => {
-    const params = {};
-    if (filters !== undefined) {
-        Object.keys(filters).forEach(key => {
-            // @ts-ignore
-            params['filter[' + key + ']'] = filters[key];
-        });
-    }
-
-    return new Promise((resolve, reject) => {
-        http.get('/api/application/nests', { params: { ...params } })
-            .then(response => resolve(
-                (response.data.data || []).map(rawDataToNest)
-            ))
-            .catch(reject);
-    });
-};
diff --git a/resources/scripts/api/admin/node.ts b/resources/scripts/api/admin/node.ts
new file mode 100644
index 000000000..cac2e96b2
--- /dev/null
+++ b/resources/scripts/api/admin/node.ts
@@ -0,0 +1,84 @@
+import { Model, UUID, WithRelationships, withRelationships } from '@/api/admin/index';
+import { Location } from '@/api/admin/location';
+import http, { QueryBuilderParams, withQueryBuilderParams } from '@/api/http';
+import { AdminTransformers } from '@/api/admin/transformers';
+import { Server } from '@/api/admin/server';
+
+interface NodePorts {
+    http: {
+        listen: number;
+        public: number;
+    };
+    sftp: {
+        listen: number;
+        public: number;
+    };
+}
+
+export interface Allocation extends Model {
+    id: number;
+    ip: string;
+    port: number;
+    alias: string | null;
+    isAssigned: boolean;
+    relationships: {
+        node?: Node;
+        server?: Server | null;
+    };
+    getDisplayText(): string;
+}
+
+export interface Node extends Model {
+    id: number;
+    uuid: UUID;
+    isPublic: boolean;
+    locationId: number;
+    databaseHostId: number;
+    name: string;
+    description: string | null;
+    fqdn: string;
+    ports: NodePorts;
+    scheme: 'http' | 'https';
+    isBehindProxy: boolean;
+    isMaintenanceMode: boolean;
+    memory: number;
+    memoryOverallocate: number;
+    disk: number;
+    diskOverallocate: number;
+    uploadSize: number;
+    daemonBase: string;
+    createdAt: Date;
+    updatedAt: Date;
+    relationships: {
+        location?: Location;
+    };
+}
+
+/**
+ * Gets a single node and returns it.
+ */
+export const getNode = async (id: string | number): Promise<WithRelationships<Node, 'location'>> => {
+    const { data } = await http.get(`/api/application/nodes/${id}`, {
+        params: {
+            include: [ 'location' ],
+        },
+    });
+
+    return withRelationships(AdminTransformers.toNode(data.data), 'location');
+};
+
+export const searchNodes = async (params: QueryBuilderParams<'name'>): Promise<Node[]> => {
+    const { data } = await http.get('/api/application/nodes', {
+        params: withQueryBuilderParams(params),
+    });
+
+    return data.data.map(AdminTransformers.toNode);
+};
+
+export const getAllocations = async (id: string | number, params?: QueryBuilderParams<'ip' | 'server_id'>): Promise<Allocation[]> => {
+    const { data } = await http.get(`/api/application/nodes/${id}/allocations`, {
+        params: withQueryBuilderParams(params),
+    });
+
+    return data.data.map(AdminTransformers.toAllocation);
+};
diff --git a/resources/scripts/api/admin/nodes/allocations/deleteAllocation.ts b/resources/scripts/api/admin/nodes/allocations/deleteAllocation.ts
new file mode 100644
index 000000000..f4a775183
--- /dev/null
+++ b/resources/scripts/api/admin/nodes/allocations/deleteAllocation.ts
@@ -0,0 +1,9 @@
+import http from '@/api/http';
+
+export default (nodeId: number, allocationId: number): Promise<void> => {
+    return new Promise((resolve, reject) => {
+        http.delete(`/api/application/nodes/${nodeId}/allocations/${allocationId}`)
+            .then(() => resolve())
+            .catch(reject);
+    });
+};
diff --git a/resources/scripts/api/admin/nodes/allocations/getAllocations.ts b/resources/scripts/api/admin/nodes/allocations/getAllocations.ts
index 55d01152b..14c99c655 100644
--- a/resources/scripts/api/admin/nodes/allocations/getAllocations.ts
+++ b/resources/scripts/api/admin/nodes/allocations/getAllocations.ts
@@ -12,7 +12,7 @@ export interface Filters {
 
 export const Context = createContext<Filters>();
 
-export default (id: string | number, include: string[] = []) => {
+export default (id: number, include: string[] = []) => {
     const { page, filters, sort, sortDirection } = useContext(Context);
 
     const params = {};
diff --git a/resources/scripts/api/admin/server.ts b/resources/scripts/api/admin/server.ts
new file mode 100644
index 000000000..f32a4fa59
--- /dev/null
+++ b/resources/scripts/api/admin/server.ts
@@ -0,0 +1,100 @@
+import useSWR, { SWRResponse } from 'swr';
+import { AxiosError } from 'axios';
+import { useRouteMatch } from 'react-router-dom';
+import http from '@/api/http';
+import { Model, UUID, withRelationships, WithRelationships } from '@/api/admin/index';
+import { AdminTransformers } from '@/api/admin/transformers';
+import { Allocation, Node } from '@/api/admin/node';
+import { User } from '@/api/admin/user';
+import { Egg, EggVariable } from '@/api/admin/egg';
+import { Nest } from '@/api/admin/nest';
+
+/**
+ * Defines the limits for a server that exists on the Panel.
+ */
+interface ServerLimits {
+    memory: number;
+    swap: number;
+    disk: number;
+    io: number;
+    cpu: number;
+    threads: string | null;
+    oomDisabled: boolean;
+}
+
+export interface ServerVariable extends EggVariable {
+    serverValue: string;
+}
+
+/**
+ * Defines a single server instance that is returned from the Panel's admin
+ * API endpoints.
+ */
+export interface Server extends Model {
+    id: number;
+    uuid: UUID;
+    externalId: string | null;
+    identifier: string;
+    name: string;
+    description: string;
+    status: string;
+    userId: number;
+    nodeId: number;
+    allocationId: number;
+    eggId: number;
+    nestId: number;
+    limits: ServerLimits;
+    featureLimits: {
+        databases: number;
+        allocations: number;
+        backups: number;
+    };
+    container: {
+        startup: string | null;
+        image: string;
+        environment: Record<string, string>;
+    };
+    createdAt: Date;
+    updatedAt: Date;
+    relationships: {
+        allocations?: Allocation[];
+        nest?: Nest;
+        egg?: Egg;
+        node?: Node;
+        user?: User;
+        variables?: ServerVariable[];
+    };
+}
+
+/**
+ * A standard API response with the minimum viable details for the frontend
+ * to correctly render a server.
+ */
+type LoadedServer = WithRelationships<Server, 'allocations' | 'user' | 'node'>;
+
+/**
+ * Fetches a server from the API and ensures that the allocations, user, and
+ * node data is loaded.
+ */
+export const getServer = async (id: number | string): Promise<LoadedServer> => {
+    const { data } = await http.get(`/api/application/servers/${id}`, {
+        params: {
+            include: [ 'allocations', 'user', 'node', 'variables' ],
+        },
+    });
+
+    return withRelationships(AdminTransformers.toServer(data), 'allocations', 'user', 'node', 'variables');
+};
+
+/**
+ * Returns an SWR instance by automatically loading in the server for the currently
+ * loaded route match in the admin area.
+ */
+export const useServerFromRoute = (): SWRResponse<LoadedServer, AxiosError> => {
+    const { params } = useRouteMatch<{ id: string }>();
+
+    return useSWR(`/api/application/servers/${params.id}`, async () => getServer(params.id), {
+        revalidateOnMount: false,
+        revalidateOnFocus: false,
+    });
+};
diff --git a/resources/scripts/api/admin/servers/createServer.ts b/resources/scripts/api/admin/servers/createServer.ts
index 88021de80..3fd94ca62 100644
--- a/resources/scripts/api/admin/servers/createServer.ts
+++ b/resources/scripts/api/admin/servers/createServer.ts
@@ -1,57 +1,50 @@
 import http from '@/api/http';
 import { Server, rawDataToServer } from '@/api/admin/servers/getServers';
 
-interface CreateServerRequest {
+export interface CreateServerRequest {
+    externalId: string;
     name: string;
     description: string | null;
-    user: number;
-    egg: number;
-    dockerImage: string;
-    startup: string;
-    skipScripts: boolean;
-    oomDisabled: boolean;
-    startOnCompletion: boolean;
-    environment: string[];
-
-    allocation: {
-        default: number;
-        additional: number[];
-    };
+    ownerId: number;
+    nodeId: number;
 
     limits: {
-        cpu: number;
-        disk: number;
-        io: number;
         memory: number;
         swap: number;
+        disk: number;
+        io: number;
+        cpu: number;
         threads: string;
-    };
+        oomDisabled: boolean;
+    }
 
     featureLimits: {
         allocations: number;
         backups: number;
         databases: number;
     };
+
+    allocation: {
+        default: number;
+        additional: number[];
+    };
+
+    startup: string;
+    environment: Record<string, any>;
+    eggId: number;
+    image: string;
+    skipScripts: boolean;
+    startOnCompletion: boolean;
 }
 
 export default (r: CreateServerRequest, include: string[] = []): Promise<Server> => {
     return new Promise((resolve, reject) => {
         http.post('/api/application/servers', {
+            externalId: r.externalId,
             name: r.name,
             description: r.description,
-            user: r.user,
-            egg: r.egg,
-            docker_image: r.dockerImage,
-            startup: r.startup,
-            skip_scripts: r.skipScripts,
-            oom_disabled: r.oomDisabled,
-            start_on_completion: r.startOnCompletion,
-            environment: r.environment,
-
-            allocation: {
-                default: r.allocation.default,
-                additional: r.allocation.additional,
-            },
+            owner_id: r.ownerId,
+            node_id: r.nodeId,
 
             limits: {
                 cpu: r.limits.cpu,
@@ -60,13 +53,26 @@ export default (r: CreateServerRequest, include: string[] = []): Promise<Server>
                 memory: r.limits.memory,
                 swap: r.limits.swap,
                 threads: r.limits.threads,
+                oom_killer: r.limits.oomDisabled,
             },
 
-            featureLimits: {
+            feature_limits: {
                 allocations: r.featureLimits.allocations,
                 backups: r.featureLimits.backups,
                 databases: r.featureLimits.databases,
             },
+
+            allocation: {
+                default: r.allocation.default,
+                additional: r.allocation.additional,
+            },
+
+            startup: r.startup,
+            environment: r.environment,
+            egg_id: r.eggId,
+            image: r.image,
+            skip_scripts: r.skipScripts,
+            start_on_completion: r.startOnCompletion,
         }, { params: { include: include.join(',') } })
             .then(({ data }) => resolve(rawDataToServer(data)))
             .catch(reject);
diff --git a/resources/scripts/api/admin/servers/getServers.ts b/resources/scripts/api/admin/servers/getServers.ts
index 8f40a30f2..e34e0a566 100644
--- a/resources/scripts/api/admin/servers/getServers.ts
+++ b/resources/scripts/api/admin/servers/getServers.ts
@@ -23,7 +23,7 @@ export interface ServerVariable {
     updatedAt: Date;
 }
 
-const rawDataToServerVariable = ({ attributes }: FractalResponseData): ServerVariable => ({
+export const rawDataToServerVariable = ({ attributes }: FractalResponseData): ServerVariable => ({
     id: attributes.id,
     eggId: attributes.egg_id,
     name: attributes.name,
diff --git a/resources/scripts/api/admin/servers/updateServer.ts b/resources/scripts/api/admin/servers/updateServer.ts
index b8c59d6cc..e74b7422a 100644
--- a/resources/scripts/api/admin/servers/updateServer.ts
+++ b/resources/scripts/api/admin/servers/updateServer.ts
@@ -43,7 +43,7 @@ export default (id: number, server: Partial<Values>, include: string[] = []): Pr
                     io: server.limits?.io,
                     cpu: server.limits?.cpu,
                     threads: server.limits?.threads,
-                    oom_disabled: server.limits?.oomDisabled,
+                    oom_killer: server.limits?.oomDisabled,
                 },
 
                 feature_limits: {
diff --git a/resources/scripts/api/admin/servers/updateServerStartup.ts b/resources/scripts/api/admin/servers/updateServerStartup.ts
index 33f598f1d..7dec26e30 100644
--- a/resources/scripts/api/admin/servers/updateServerStartup.ts
+++ b/resources/scripts/api/admin/servers/updateServerStartup.ts
@@ -14,7 +14,7 @@ export default (id: number, values: Partial<Values>, include: string[] = []): Pr
         http.patch(
             `/api/application/servers/${id}/startup`,
             {
-                startup: values.startup,
+                startup: values.startup !== '' ? values.startup : null,
                 environment: values.environment,
                 egg_id: values.eggId,
                 image: values.image,
diff --git a/resources/scripts/api/admin/transformers.ts b/resources/scripts/api/admin/transformers.ts
new file mode 100644
index 000000000..bed54fb8f
--- /dev/null
+++ b/resources/scripts/api/admin/transformers.ts
@@ -0,0 +1,212 @@
+/* eslint-disable camelcase */
+import { Allocation, Node } from '@/api/admin/node';
+import { Server, ServerVariable } from '@/api/admin/server';
+import { FractalResponseData, FractalResponseList } from '@/api/http';
+import { User, UserRole } from '@/api/admin/user';
+import { Location } from '@/api/admin/location';
+import { Egg, EggVariable } from '@/api/admin/egg';
+import { Nest } from '@/api/admin/nest';
+
+const isList = (data: FractalResponseList | FractalResponseData): data is FractalResponseList => data.object === 'list';
+
+function transform<T, M = undefined> (data: undefined, transformer: (callback: FractalResponseData) => T, missing?: M): undefined;
+function transform<T, M> (data: FractalResponseData | undefined, transformer: (callback: FractalResponseData) => T, missing?: M): T | M | undefined;
+function transform<T, M> (data: FractalResponseList | undefined, transformer: (callback: FractalResponseData) => T, missing?: M): T[] | undefined;
+function transform<T> (data: FractalResponseData | FractalResponseList | undefined, transformer: (callback: FractalResponseData) => T, missing = undefined) {
+    if (data === undefined) return undefined;
+
+    if (isList(data)) {
+        return data.data.map(transformer);
+    }
+
+    return !data ? missing : transformer(data);
+}
+
+export class AdminTransformers {
+    static toServer = ({ attributes }: FractalResponseData): Server => {
+        const { oom_disabled, ...limits } = attributes.limits;
+        const { allocations, egg, nest, node, user, variables } = attributes.relationships || {};
+
+        return {
+            id: attributes.id,
+            uuid: attributes.uuid,
+            externalId: attributes.external_id,
+            identifier: attributes.identifier,
+            name: attributes.name,
+            description: attributes.description,
+            status: attributes.status,
+            userId: attributes.owner_id,
+            nodeId: attributes.node_id,
+            allocationId: attributes.allocation_id,
+            eggId: attributes.egg_id,
+            nestId: attributes.nest_id,
+            limits: { ...limits, oomDisabled: oom_disabled },
+            featureLimits: attributes.feature_limits,
+            container: attributes.container,
+            createdAt: new Date(attributes.created_at),
+            updatedAt: new Date(attributes.updated_at),
+            relationships: {
+                allocations: transform(allocations as FractalResponseList | undefined, this.toAllocation),
+                nest: transform(nest as FractalResponseData | undefined, this.toNest),
+                egg: transform(egg as FractalResponseData | undefined, this.toEgg),
+                node: transform(node as FractalResponseData | undefined, this.toNode),
+                user: transform(user as FractalResponseData | undefined, this.toUser),
+                variables: transform(variables as FractalResponseList | undefined, this.toServerEggVariable),
+            },
+        };
+    };
+
+    static toNode = ({ attributes }: FractalResponseData): Node => {
+        return {
+            id: attributes.id,
+            uuid: attributes.uuid,
+            isPublic: attributes.public,
+            locationId: attributes.location_id,
+            databaseHostId: attributes.database_host_id,
+            name: attributes.name,
+            description: attributes.description,
+            fqdn: attributes.fqdn,
+            ports: {
+                http: {
+                    public: attributes.publicPortHttp,
+                    listen: attributes.listenPortHttp,
+                },
+                sftp: {
+                    public: attributes.publicPortSftp,
+                    listen: attributes.listenPortSftp,
+                },
+            },
+            scheme: attributes.scheme,
+            isBehindProxy: attributes.behindProxy,
+            isMaintenanceMode: attributes.maintenance_mode,
+            memory: attributes.memory,
+            memoryOverallocate: attributes.memory_overallocate,
+            disk: attributes.disk,
+            diskOverallocate: attributes.disk_overallocate,
+            uploadSize: attributes.upload_size,
+            daemonBase: attributes.daemonBase,
+            createdAt: new Date(attributes.created_at),
+            updatedAt: new Date(attributes.updated_at),
+            relationships: {
+                location: transform(attributes.relationships?.location as FractalResponseData, this.toLocation),
+            },
+        };
+    };
+
+    static toUserRole = ({ attributes }: FractalResponseData): UserRole => ({
+        id: attributes.id,
+        name: attributes.name,
+        description: attributes.description,
+        relationships: {},
+    });
+
+    static toUser = ({ attributes }: FractalResponseData): User => {
+        return {
+            id: attributes.id,
+            uuid: attributes.uuid,
+            externalId: attributes.external_id,
+            username: attributes.username,
+            email: attributes.email,
+            language: attributes.language,
+            adminRoleId: attributes.adminRoleId || null,
+            roleName: attributes.role_name,
+            isRootAdmin: attributes.root_admin,
+            isUsingTwoFactor: attributes['2fa'] || false,
+            avatarUrl: attributes.avatar_url,
+            createdAt: new Date(attributes.created_at),
+            updatedAt: new Date(attributes.updated_at),
+            relationships: {
+                role: transform(attributes.relationships?.role as FractalResponseData, this.toUserRole) || null,
+            },
+        };
+    };
+
+    static toLocation = ({ attributes }: FractalResponseData): Location => ({
+        id: attributes.id,
+        short: attributes.short,
+        long: attributes.long,
+        createdAt: new Date(attributes.created_at),
+        updatedAt: new Date(attributes.updated_at),
+        relationships: {
+            nodes: transform(attributes.relationships?.node as FractalResponseList, this.toNode),
+        },
+    });
+
+    static toEgg = ({ attributes }: FractalResponseData): Egg => ({
+        id: attributes.id,
+        uuid: attributes.uuid,
+        nestId: attributes.nest_id,
+        author: attributes.author,
+        name: attributes.name,
+        description: attributes.description,
+        features: attributes.features,
+        dockerImages: attributes.docker_images,
+        configFiles: attributes.config?.files,
+        configStartup: attributes.config?.startup,
+        configStop: attributes.config?.stop,
+        configFrom: attributes.config?.extends,
+        startup: attributes.startup,
+        copyScriptFrom: attributes.copy_script_from,
+        scriptContainer: attributes.script?.container,
+        scriptEntry: attributes.script?.entry,
+        scriptIsPrivileged: attributes.script?.privileged,
+        scriptInstall: attributes.script?.install,
+        createdAt: new Date(attributes.created_at),
+        updatedAt: new Date(attributes.updated_at),
+        relationships: {
+            nest: transform(attributes.relationships?.nest as FractalResponseData, this.toNest),
+            variables: transform(attributes.relationships?.variables as FractalResponseList, this.toEggVariable),
+        },
+    });
+
+    static toEggVariable = ({ attributes }: FractalResponseData): EggVariable => ({
+        id: attributes.id,
+        eggId: attributes.egg_id,
+        name: attributes.name,
+        description: attributes.description,
+        environmentVariable: attributes.env_variable,
+        defaultValue: attributes.default_value,
+        isUserViewable: attributes.user_viewable,
+        isUserEditable: attributes.user_editable,
+        // isRequired: attributes.required,
+        rules: attributes.rules,
+        createdAt: new Date(attributes.created_at),
+        updatedAt: new Date(attributes.updated_at),
+        relationships: {},
+    });
+
+    static toServerEggVariable = (data: FractalResponseData): ServerVariable => ({
+        ...this.toEggVariable(data),
+        serverValue: data.attributes.server_value,
+    });
+
+    static toAllocation = ({ attributes }: FractalResponseData): Allocation => ({
+        id: attributes.id,
+        ip: attributes.ip,
+        port: attributes.port,
+        alias: attributes.alias || null,
+        isAssigned: attributes.assigned,
+        relationships: {
+            node: transform(attributes.relationships?.node as FractalResponseData, this.toNode),
+            server: transform(attributes.relationships?.server as FractalResponseData, this.toServer),
+        },
+        getDisplayText (): string {
+            const raw = `${this.ip}:${this.port}`;
+
+            return !this.alias ? raw : `${this.alias} (${raw})`;
+        },
+    });
+
+    static toNest = ({ attributes }: FractalResponseData): Nest => ({
+        id: attributes.id,
+        uuid: attributes.uuid,
+        author: attributes.author,
+        name: attributes.name,
+        description: attributes.description,
+        createdAt: new Date(attributes.created_at),
+        updatedAt: new Date(attributes.updated_at),
+        relationships: {
+            eggs: transform(attributes.relationships?.eggs as FractalResponseList, this.toEgg),
+        },
+    });
+}
diff --git a/resources/scripts/api/admin/user.ts b/resources/scripts/api/admin/user.ts
new file mode 100644
index 000000000..b92315208
--- /dev/null
+++ b/resources/scripts/api/admin/user.ts
@@ -0,0 +1,44 @@
+import { Model, UUID } from '@/api/admin/index';
+import { Server } from '@/api/admin/server';
+import http, { QueryBuilderParams, withQueryBuilderParams } from '@/api/http';
+import { AdminTransformers } from '@/api/admin/transformers';
+
+export interface User extends Model {
+    id: number;
+    uuid: UUID;
+    externalId: string;
+    username: string;
+    email: string;
+    language: string;
+    adminRoleId: number | null;
+    roleName: string;
+    isRootAdmin: boolean;
+    isUsingTwoFactor: boolean;
+    avatarUrl: string;
+    createdAt: Date;
+    updatedAt: Date;
+    relationships: {
+        role: UserRole | null;
+        servers?: Server[];
+    };
+}
+
+export interface UserRole extends Model {
+    id: string;
+    name: string;
+    description: string;
+}
+
+export const getUser = async (id: string | number): Promise<User> => {
+    const { data } = await http.get(`/api/application/users/${id}`);
+
+    return AdminTransformers.toUser(data.data);
+};
+
+export const searchUserAccounts = async (params: QueryBuilderParams<'username' | 'email'>): Promise<User[]> => {
+    const { data } = await http.get('/api/application/users', {
+        params: withQueryBuilderParams(params),
+    });
+
+    return data.data.map(AdminTransformers.toUser);
+};
diff --git a/resources/scripts/api/admin/users/searchUsers.ts b/resources/scripts/api/admin/users/searchUsers.ts
deleted file mode 100644
index 450ca436c..000000000
--- a/resources/scripts/api/admin/users/searchUsers.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import http from '@/api/http';
-import { User, rawDataToUser } from '@/api/admin/users/getUsers';
-
-interface Filters {
-    username?: string;
-    email?: string;
-}
-
-export default (filters?: Filters): Promise<User[]> => {
-    const params = {};
-    if (filters !== undefined) {
-        Object.keys(filters).forEach(key => {
-            // @ts-ignore
-            params['filter[' + key + ']'] = filters[key];
-        });
-    }
-
-    return new Promise((resolve, reject) => {
-        http.get('/api/application/users', { params: { ...params } })
-            .then(response => resolve(
-                (response.data.data || []).map(rawDataToUser)
-            ))
-            .catch(reject);
-    });
-};
diff --git a/resources/scripts/api/admin/users/updateUser.ts b/resources/scripts/api/admin/users/updateUser.ts
index 806a62618..449f7be15 100644
--- a/resources/scripts/api/admin/users/updateUser.ts
+++ b/resources/scripts/api/admin/users/updateUser.ts
@@ -2,6 +2,7 @@ import http from '@/api/http';
 import { User, rawDataToUser } from '@/api/admin/users/getUsers';
 
 export interface Values {
+    externalId: string;
     username: string;
     email: string;
     password: string;
diff --git a/resources/scripts/api/http.ts b/resources/scripts/api/http.ts
index 4e33541ab..ef2ed8956 100644
--- a/resources/scripts/api/http.ts
+++ b/resources/scripts/api/http.ts
@@ -7,10 +7,21 @@ const http: AxiosInstance = axios.create({
         'X-Requested-With': 'XMLHttpRequest',
         Accept: 'application/json',
         'Content-Type': 'application/json',
-        'X-CSRF-Token': (window as any).X_CSRF_TOKEN as string || '',
     },
 });
 
+http.interceptors.request.use(req => {
+    const cookies = document.cookie.split(';').reduce((obj, val) => {
+        const [ key, value ] = val.trim().split('=').map(decodeURIComponent);
+
+        return { ...obj, [key]: value };
+    }, {} as Record<string, string>);
+
+    req.headers['X-XSRF-TOKEN'] = cookies['XSRF-TOKEN'] || 'nil';
+
+    return req;
+});
+
 http.interceptors.request.use(req => {
     if (!req.url?.endsWith('/resources') && (req.url?.indexOf('_debugbar') || -1) < 0) {
         store.getActions().progress.startContinuous();
@@ -111,3 +122,43 @@ export function getPaginationSet (data: any): PaginationDataSet {
         totalPages: data.total_pages,
     };
 }
+
+type QueryBuilderFilterValue = string | number | boolean | null;
+
+export interface QueryBuilderParams<FilterKeys extends string = string, SortKeys extends string = string> {
+    filters?: {
+        [K in FilterKeys]?: QueryBuilderFilterValue | Readonly<QueryBuilderFilterValue[]>;
+    };
+    sorts?: {
+        [K in SortKeys]?: -1 | 0 | 1 | 'asc' | 'desc' | null;
+    };
+}
+
+/**
+ * Helper function that parses a data object provided and builds query parameters
+ * for the Laravel Query Builder package automatically. This will apply sorts and
+ * filters deterministically based on the provided values.
+ */
+export const withQueryBuilderParams = (data?: QueryBuilderParams): Record<string, unknown> => {
+    if (!data) return {};
+
+    const filters = Object.keys(data.filters || {}).reduce((obj, key) => {
+        const value = data.filters?.[key];
+
+        return !value || value === '' ? obj : { ...obj, [`filter[${key}]`]: value };
+    }, {} as NonNullable<QueryBuilderParams['filters']>);
+
+    const sorts = Object.keys(data.sorts || {}).reduce((arr, key) => {
+        const value = data.sorts?.[key];
+        if (!value || ![ 'asc', 'desc', 1, -1 ].includes(value)) {
+            return arr;
+        }
+
+        return [ ...arr, (value === -1 || value === 'desc' ? '-' : '') + key ];
+    }, [] as string[]);
+
+    return {
+        ...filters,
+        sorts: !sorts.length ? undefined : sorts.join(','),
+    };
+};
diff --git a/resources/scripts/api/server/getServerResourceUsage.ts b/resources/scripts/api/server/getServerResourceUsage.ts
index 6b71dcf54..2a4c01cf6 100644
--- a/resources/scripts/api/server/getServerResourceUsage.ts
+++ b/resources/scripts/api/server/getServerResourceUsage.ts
@@ -10,6 +10,7 @@ export interface ServerStats {
     diskUsageInBytes: number;
     networkRxInBytes: number;
     networkTxInBytes: number;
+    uptime: number;
 }
 
 export default (server: string): Promise<ServerStats> => {
@@ -23,6 +24,7 @@ export default (server: string): Promise<ServerStats> => {
                 diskUsageInBytes: attributes.resources.disk_bytes,
                 networkRxInBytes: attributes.resources.network_rx_bytes,
                 networkTxInBytes: attributes.resources.network_tx_bytes,
+                uptime: attributes.resources.uptime,
             }))
             .catch(reject);
     });
diff --git a/resources/scripts/components/App.tsx b/resources/scripts/components/App.tsx
index 6d73f5e66..0a22c5c4c 100644
--- a/resources/scripts/components/App.tsx
+++ b/resources/scripts/components/App.tsx
@@ -1,7 +1,6 @@
-import React, { lazy, useEffect, Suspense } from 'react';
-import ReactGA from 'react-ga';
+import React, { lazy, Suspense } from 'react';
 import { hot } from 'react-hot-loader/root';
-import { Route, Router, Switch, useLocation } from 'react-router-dom';
+import { Route, Router, Switch } from 'react-router-dom';
 import { StoreProvider } from 'easy-peasy';
 import { store } from '@/state';
 import DashboardRouter from '@/routers/DashboardRouter';
@@ -14,6 +13,7 @@ import tw from 'twin.macro';
 import { history } from '@/components/history';
 import { setupInterceptors } from '@/api/interceptors';
 import GlobalStyles from '@/components/GlobalStyles';
+import Spinner from '@/components/elements/Spinner';
 
 const ChunkedAdminRouter = lazy(() => import(/* webpackChunkName: "admin" */'@/routers/AdminRouter'));
 
@@ -37,16 +37,6 @@ interface ExtendedWindow extends Window {
 
 setupInterceptors(history);
 
-const Pageview = () => {
-    const { pathname } = useLocation();
-
-    useEffect(() => {
-        ReactGA.pageview(pathname);
-    }, [ pathname ]);
-
-    return null;
-};
-
 const App = () => {
     const { PterodactylUser, SiteConfiguration } = (window as ExtendedWindow);
     if (PterodactylUser && !store.getState().user.data) {
@@ -68,12 +58,6 @@ const App = () => {
         store.getActions().settings.setSettings(SiteConfiguration!);
     }
 
-    useEffect(() => {
-        if (SiteConfiguration?.analytics) {
-            ReactGA.initialize(SiteConfiguration!.analytics);
-        }
-    }, []);
-
     return (
         <>
             <GlobalStyles/>
@@ -81,8 +65,7 @@ const App = () => {
                 <ProgressBar/>
                 <div css={tw`mx-auto w-auto`}>
                     <Router history={history}>
-                        <Suspense fallback={<div>Loading...</div>}>
-                            {SiteConfiguration?.analytics && <Pageview/>}
+                        <Suspense fallback={<Spinner centered/>}>
                             <Switch>
                                 <Route path="/server/:id" component={ServerRouter}/>
                                 <Route path="/auth" component={AuthenticationRouter}/>
diff --git a/resources/scripts/components/NavigationBar.tsx b/resources/scripts/components/NavigationBar.tsx
index 939c9ff07..b3620ba8b 100644
--- a/resources/scripts/components/NavigationBar.tsx
+++ b/resources/scripts/components/NavigationBar.tsx
@@ -6,6 +6,8 @@ import { useStoreState } from 'easy-peasy';
 import { ApplicationStore } from '@/state';
 import SearchContainer from '@/components/dashboard/search/SearchContainer';
 import tw, { styled, theme } from 'twin.macro';
+import http from '@/api/http';
+import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
 
 const Navigation = styled.div`
     ${tw`w-full bg-neutral-900 shadow-md overflow-x-auto`};
@@ -26,7 +28,7 @@ const Navigation = styled.div`
 const RightNavigation = styled.div`
     ${tw`flex h-full items-center justify-center`};
 
-    & > a, & > .navigation-link {
+    & > a, & > button, & > .navigation-link {
         ${tw`flex items-center h-full no-underline text-neutral-300 px-6 cursor-pointer transition-all duration-150`};
 
         &:active, &:hover {
@@ -42,9 +44,19 @@ const RightNavigation = styled.div`
 export default () => {
     const name = useStoreState((state: ApplicationStore) => state.settings.data!.name);
     const rootAdmin = useStoreState((state: ApplicationStore) => state.user.data!.rootAdmin);
+    const [ isLoggingOut, setIsLoggingOut ] = React.useState(false);
+
+    const onTriggerLogout = () => {
+        setIsLoggingOut(true);
+        http.post('/auth/logout').finally(() => {
+            // @ts-ignore
+            window.location = '/';
+        });
+    };
 
     return (
         <Navigation>
+            <SpinnerOverlay visible={isLoggingOut} />
             <div css={tw`mx-auto w-full flex items-center`} style={{ maxWidth: '1200px', height: '3.5rem' }}>
                 <div id={'logo'}>
                     <Link to={'/'}>
@@ -60,16 +72,14 @@ export default () => {
                     <NavLink to={'/account'}>
                         <FontAwesomeIcon icon={faUserCircle}/>
                     </NavLink>
-
                     {rootAdmin &&
-                    <a href={'/admin'}>
+                    <NavLink to={'/admin'}>
                         <FontAwesomeIcon icon={faCogs}/>
-                    </a>
+                    </NavLink>
                     }
-
-                    <a href={'/auth/logout'}>
+                    <button onClick={onTriggerLogout}>
                         <FontAwesomeIcon icon={faSignOutAlt}/>
-                    </a>
+                    </button>
                 </RightNavigation>
             </div>
         </Navigation>
diff --git a/resources/scripts/components/admin/AdminBox.tsx b/resources/scripts/components/admin/AdminBox.tsx
index 3c77e8180..da0543b7e 100644
--- a/resources/scripts/components/admin/AdminBox.tsx
+++ b/resources/scripts/components/admin/AdminBox.tsx
@@ -1,38 +1,36 @@
-import React, { memo } from 'react';
+import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import tw from 'twin.macro';
-import isEqual from 'react-fast-compare';
+import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
 
 interface Props {
     icon?: IconProp;
+    isLoading?: boolean;
     title: string | React.ReactNode;
     className?: string;
-    padding?: boolean;
+    noPadding?: boolean;
     children: React.ReactNode;
+    button?: React.ReactNode;
 }
 
-const AdminBox = ({ icon, title, className, padding, children }: Props) => {
-    if (padding === undefined) {
-        padding = true;
-    }
-
-    return (
-        <div css={tw`rounded shadow-md bg-neutral-700`} className={className}>
-            <div css={tw`bg-neutral-900 rounded-t px-4 py-3 border-b border-black`}>
-                {typeof title === 'string' ?
-                    <p css={tw`text-sm uppercase`}>
-                        {icon && <FontAwesomeIcon icon={icon} css={tw`mr-2 text-neutral-300`}/>}{title}
-                    </p>
-                    :
-                    title
-                }
-            </div>
-            <div css={padding ? tw`px-4 py-3` : undefined}>
-                {children}
-            </div>
+const AdminBox = ({ icon, title, className, isLoading, children, button, noPadding }: Props) => (
+    <div css={tw`relative rounded shadow-md bg-neutral-700`} className={className}>
+        <SpinnerOverlay visible={isLoading || false}/>
+        <div css={tw`flex flex-row bg-neutral-900 rounded-t px-4 xl:px-5 py-3 border-b border-black`}>
+            {typeof title === 'string' ?
+                <p css={tw`text-sm uppercase`}>
+                    {icon && <FontAwesomeIcon icon={icon} css={tw`mr-2 text-neutral-300`}/>}{title}
+                </p>
+                :
+                title
+            }
+            {button}
         </div>
-    );
-};
+        <div css={[ !noPadding && tw`px-4 xl:px-5 py-5` ]}>
+            {children}
+        </div>
+    </div>
+);
 
-export default memo(AdminBox, isEqual);
+export default AdminBox;
diff --git a/resources/scripts/components/admin/AdminContentBlock.tsx b/resources/scripts/components/admin/AdminContentBlock.tsx
index 5793014e4..d4317a330 100644
--- a/resources/scripts/components/admin/AdminContentBlock.tsx
+++ b/resources/scripts/components/admin/AdminContentBlock.tsx
@@ -15,11 +15,8 @@ const AdminContentBlock: React.FC<{ title?: string; showFlashKey?: string; class
     return (
         // <CSSTransition timeout={150} classNames={'fade'} appear in>
         <>
-            {showFlashKey &&
-            <FlashMessageRender byKey={showFlashKey} css={tw`mb-4`}/>
-            }
+            {showFlashKey && <FlashMessageRender byKey={showFlashKey} css={tw`mb-4`}/>}
             {children}
-
             {/* <p css={tw`text-center text-neutral-500 text-xs mt-4`}>
                 &copy; 2015 - 2021&nbsp;
                 <a
diff --git a/resources/scripts/components/admin/AdminTable.tsx b/resources/scripts/components/admin/AdminTable.tsx
index 232221e6b..3bf55345e 100644
--- a/resources/scripts/components/admin/AdminTable.tsx
+++ b/resources/scripts/components/admin/AdminTable.tsx
@@ -196,9 +196,9 @@ export const Loading = () => {
     );
 };
 
-export const NoItems = () => {
+export const NoItems = ({ className }: { className?: string }) => {
     return (
-        <div css={tw`w-full flex flex-col items-center justify-center py-6 px-8`}>
+        <div css={tw`w-full flex flex-col items-center justify-center py-6 px-8`} className={className}>
             <div css={tw`h-48 flex`}>
                 <img src={'/assets/svgs/not_found.svg'} alt={'No Items'} css={tw`h-full select-none`}/>
             </div>
@@ -227,7 +227,8 @@ export const ContentWrapper = ({ checked, onSelectAllClick, onSearch, children }
             }
 
             setLoading(true);
-            onSearch(query).then(() => setLoading(false));
+            onSearch(query)
+                .then(() => setLoading(false));
         }, 200),
         [],
     );
diff --git a/resources/scripts/components/admin/Sidebar.tsx b/resources/scripts/components/admin/Sidebar.tsx
new file mode 100644
index 000000000..b5ab0a047
--- /dev/null
+++ b/resources/scripts/components/admin/Sidebar.tsx
@@ -0,0 +1,84 @@
+import tw, { css } from 'twin.macro';
+import styled from 'styled-components/macro';
+import { withSubComponents } from '@/components/helpers';
+
+const Wrapper = styled.div`
+  ${tw`w-full flex flex-col px-4`};
+
+  & > a {
+    ${tw`h-10 w-full flex flex-row items-center text-neutral-300 cursor-pointer select-none px-4`};
+    ${tw`hover:text-neutral-50`};
+
+    & > svg {
+      ${tw`h-6 w-6 flex flex-shrink-0`};
+    }
+
+    & > span {
+      ${tw`font-header font-medium text-lg whitespace-nowrap leading-none ml-3`};
+    }
+
+    &:active, &.active {
+      ${tw`text-neutral-50 bg-neutral-800 rounded`};
+    }
+  }
+`;
+
+const Section = styled.div`
+  ${tw`h-[18px] font-header font-medium text-xs text-neutral-300 whitespace-nowrap uppercase ml-4 mb-1 select-none`};
+
+  &:not(:first-of-type) {
+    ${tw`mt-4`};
+  }
+`;
+
+const User = styled.div`
+  ${tw`h-16 w-full flex items-center bg-neutral-700 justify-center`};
+`;
+
+const Sidebar = styled.div<{ $collapsed?: boolean }>`
+  ${tw`h-screen hidden md:flex flex-col items-center flex-shrink-0 bg-neutral-900 overflow-x-hidden ease-linear`};
+  ${tw`transition-[width] duration-150 ease-in`};
+  ${tw`w-[17.5rem]`};
+
+  & > a {
+    ${tw`h-10 w-full flex flex-row items-center text-neutral-300 cursor-pointer select-none px-8`};
+    ${tw`hover:text-neutral-50`};
+
+    & > svg {
+      ${tw`transition-none h-6 w-6 flex flex-shrink-0`};
+    }
+
+    & > span {
+      ${tw`font-header font-medium text-lg whitespace-nowrap leading-none ml-3`};
+    }
+  }
+
+  ${props => props.$collapsed && css`
+    ${tw`w-20`};
+
+    ${Section} {
+      ${tw`invisible`};
+    }
+
+    ${Wrapper} {
+      ${tw`px-5`};
+
+      & > a {
+        ${tw`justify-center px-0`};
+      }
+    }
+
+    & > a {
+      ${tw`justify-center px-4`};
+    }
+
+    & > a > span,
+    ${User} > div,
+    ${User} > a,
+    ${Wrapper} > a > span {
+      ${tw`hidden`};
+    }
+  `};
+`;
+
+export default withSubComponents(Sidebar, { Section, Wrapper, User });
diff --git a/resources/scripts/components/admin/SubNavigation.tsx b/resources/scripts/components/admin/SubNavigation.tsx
index e0dfe7091..42935c8b7 100644
--- a/resources/scripts/components/admin/SubNavigation.tsx
+++ b/resources/scripts/components/admin/SubNavigation.tsx
@@ -3,37 +3,38 @@ import { NavLink } from 'react-router-dom';
 import tw, { styled } from 'twin.macro';
 
 export const SubNavigation = styled.div`
-    ${tw`flex flex-row items-center flex-shrink-0 h-12 mb-4 border-b border-neutral-700`};
+  ${tw`flex flex-row items-center flex-shrink-0 h-12 mb-4 border-b border-neutral-700`};
 
-    & > div {
-        ${tw`flex flex-col justify-center flex-shrink-0 h-full`};
+  & > a {
+    ${tw`flex flex-row items-center h-full px-4 border-b text-neutral-300 text-base whitespace-nowrap border-transparent`};
 
-        & > a {
-            ${tw`flex flex-row items-center h-full px-4 border-t text-neutral-300`};
-            border-top-color: transparent !important;
-
-            & > svg {
-                ${tw`w-6 h-6 mr-2`};
-            }
-
-            & > span {
-                ${tw`text-base whitespace-nowrap`};
-            }
-
-            &:active, &.active {
-                ${tw`border-b text-primary-300 border-primary-300`};
-            }
-        }
+    & > svg {
+      ${tw`w-6 h-6 mr-2`};
     }
+
+    &:active, &.active {
+      ${tw`text-primary-300 border-primary-300`};
+    }
+  }
 `;
 
-export const SubNavigationLink = ({ to, name, children }: { to: string, name: string, children: React.ReactNode }) => {
-    return (
-        <div>
-            <NavLink to={to} exact>
-                {children}
-                <span>{name}</span>
-            </NavLink>
-        </div>
-    );
-};
+interface Props {
+    to: string;
+    name: string;
+}
+
+interface PropsWithIcon extends Props {
+    icon: React.ComponentType;
+    children?: never;
+}
+
+interface PropsWithoutIcon extends Props {
+    icon?: never;
+    children: React.ReactNode;
+}
+
+export const SubNavigationLink = ({ to, name, icon: IconComponent, children }: PropsWithIcon | PropsWithoutIcon) => (
+    <NavLink to={to} exact>
+        {IconComponent ? <IconComponent/> : children}{name}
+    </NavLink>
+);
diff --git a/resources/scripts/components/admin/databases/DatabaseEditContainer.tsx b/resources/scripts/components/admin/databases/DatabaseEditContainer.tsx
index 35e95e958..bd58b1a11 100644
--- a/resources/scripts/components/admin/databases/DatabaseEditContainer.tsx
+++ b/resources/scripts/components/admin/databases/DatabaseEditContainer.tsx
@@ -134,7 +134,7 @@ export const InformationContainer = ({ title, initialValues, children, onSubmit
                                     {children}
                                     <div css={tw`flex ml-auto`}>
                                         <Button type={'submit'} disabled={isSubmitting || !isValid}>
-                                            Save
+                                            Save Changes
                                         </Button>
                                     </div>
                                 </div>
diff --git a/resources/scripts/components/admin/locations/LocationEditContainer.tsx b/resources/scripts/components/admin/locations/LocationEditContainer.tsx
index 98eeb061a..a465364bb 100644
--- a/resources/scripts/components/admin/locations/LocationEditContainer.tsx
+++ b/resources/scripts/components/admin/locations/LocationEditContainer.tsx
@@ -109,7 +109,7 @@ const EditInformationContainer = () => {
 
                                     <div css={tw`flex ml-auto`}>
                                         <Button type={'submit'} disabled={isSubmitting || !isValid}>
-                                            Save
+                                            Save Changes
                                         </Button>
                                     </div>
                                 </div>
diff --git a/resources/scripts/components/admin/mounts/MountEditContainer.tsx b/resources/scripts/components/admin/mounts/MountEditContainer.tsx
index 174720fa0..c7392e9a1 100644
--- a/resources/scripts/components/admin/mounts/MountEditContainer.tsx
+++ b/resources/scripts/components/admin/mounts/MountEditContainer.tsx
@@ -97,7 +97,7 @@ const MountEditContainer = () => {
             <FlashMessageRender byKey={'mount'} css={tw`mb-4`}/>
 
             <MountForm
-                action={'Save'}
+                action={'Save Changes'}
                 title={'Edit Mount'}
                 initialValues={{
                     name: mount.name,
diff --git a/resources/scripts/components/admin/nests/NestEditContainer.tsx b/resources/scripts/components/admin/nests/NestEditContainer.tsx
index 3e92d7f63..c5b148e97 100644
--- a/resources/scripts/components/admin/nests/NestEditContainer.tsx
+++ b/resources/scripts/components/admin/nests/NestEditContainer.tsx
@@ -130,7 +130,7 @@ const EditInformationContainer = () => {
 
                                 <div css={tw`flex ml-auto`}>
                                     <Button type={'submit'} disabled={isSubmitting || !isValid}>
-                                        Save
+                                        Save Changes
                                     </Button>
                                 </div>
                             </div>
diff --git a/resources/scripts/components/admin/nests/NewEggContainer.tsx b/resources/scripts/components/admin/nests/NewEggContainer.tsx
index 28c5b470a..0c48c70a5 100644
--- a/resources/scripts/components/admin/nests/NewEggContainer.tsx
+++ b/resources/scripts/components/admin/nests/NewEggContainer.tsx
@@ -1,8 +1,51 @@
-import React from 'react';
+import createEgg from '@/api/admin/eggs/createEgg';
+import { EggImageContainer, EggInformationContainer, EggLifecycleContainer, EggProcessContainer, EggProcessContainerRef, EggStartupContainer } from '@/components/admin/nests/eggs/EggSettingsContainer';
+import Button from '@/components/elements/Button';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import useFlash from '@/plugins/useFlash';
+import { Form, Formik, FormikHelpers } from 'formik';
+import React, { useRef } from 'react';
+import { useParams } from 'react-router';
+import { useHistory } from 'react-router-dom';
 import tw from 'twin.macro';
 import AdminContentBlock from '@/components/admin/AdminContentBlock';
+import { object } from 'yup';
+
+interface Values {
+    name: string;
+    description: string;
+    startup: string;
+    dockerImages: string;
+    configStop: string;
+    configStartup: string;
+    configFiles: string;
+}
 
 export default () => {
+    const params = useParams<{ nestId: string }>();
+    const history = useHistory();
+
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+
+    const ref = useRef<EggProcessContainerRef>();
+
+    const submit = async (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
+        clearFlashes('egg:create');
+
+        const nestId = Number(params.nestId);
+
+        values.configStartup = await ref.current?.getStartupConfiguration() || '';
+        values.configFiles = await ref.current?.getFilesConfiguration() || '';
+
+        createEgg({ ...values, dockerImages: values.dockerImages.split('\n'), nestId })
+            .then(egg => history.push(`/admin/nests/${nestId}/eggs/${egg.id}`))
+            .catch(error => {
+                console.error(error);
+                clearAndAddHttpError({ key: 'egg:create', error });
+            })
+            .then(() => setSubmitting(false));
+    };
+
     return (
         <AdminContentBlock title={'New Egg'}>
             <div css={tw`w-full flex flex-row items-center mb-8`}>
@@ -11,6 +54,48 @@ export default () => {
                     <p css={tw`text-base text-neutral-400 whitespace-nowrap overflow-ellipsis overflow-hidden`}>Add a new egg to the panel.</p>
                 </div>
             </div>
+
+            <FlashMessageRender key={'egg:create'} css={tw`mb-4`}/>
+
+            <Formik
+                onSubmit={submit}
+                initialValues={{
+                    name: '',
+                    description: '',
+                    startup: '',
+                    dockerImages: '',
+                    configStop: '',
+                    configStartup: '{}',
+                    configFiles: '{}',
+                }}
+                validationSchema={object().shape({
+                })}
+            >
+                {({ isSubmitting, isValid }) => (
+                    <Form>
+                        <div css={tw`grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6 mb-6`}>
+                            <EggInformationContainer/>
+                        </div>
+
+                        <EggStartupContainer css={tw`mb-6`}/>
+
+                        <div css={tw`grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6 mb-6`}>
+                            <EggImageContainer/>
+                            <EggLifecycleContainer/>
+                        </div>
+
+                        <EggProcessContainer ref={ref} css={tw`mb-6`}/>
+
+                        <div css={tw`bg-neutral-700 rounded shadow-md py-2 px-6 mb-16`}>
+                            <div css={tw`flex flex-row`}>
+                                <Button type="submit" size="small" css={tw`ml-auto`} disabled={isSubmitting || !isValid}>
+                                   Create
+                                </Button>
+                            </div>
+                        </div>
+                    </Form>
+                )}
+            </Formik>
         </AdminContentBlock>
     );
 };
diff --git a/resources/scripts/components/admin/nests/eggs/EggExportButton.tsx b/resources/scripts/components/admin/nests/eggs/EggExportButton.tsx
new file mode 100644
index 000000000..0a9442f05
--- /dev/null
+++ b/resources/scripts/components/admin/nests/eggs/EggExportButton.tsx
@@ -0,0 +1,85 @@
+import { exportEgg } from '@/api/admin/egg';
+import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
+import useFlash from '@/plugins/useFlash';
+import { jsonLanguage } from '@codemirror/lang-json';
+import Editor from '@/components/elements/Editor';
+import React, { useEffect, useState } from 'react';
+import Button from '@/components/elements/Button';
+import Modal from '@/components/elements/Modal';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import { useRouteMatch } from 'react-router-dom';
+import tw from 'twin.macro';
+
+export default ({ className }: { className?: string }) => {
+    const { params: { id: eggId } } = useRouteMatch<{ id: string }>();
+    const { clearAndAddHttpError, clearFlashes } = useFlash();
+
+    const [ visible, setVisible ] = useState<boolean>(false);
+    const [ loading, setLoading ] = useState<boolean>(true);
+    const [ content, setContent ] = useState<Record<string, any> | null>(null);
+
+    useEffect(() => {
+        if (!visible) {
+            return;
+        }
+
+        clearFlashes('egg:export');
+        setLoading(true);
+
+        exportEgg(Number(eggId))
+            .then(setContent)
+            .catch(error => clearAndAddHttpError({ key: 'egg:export', error }))
+            .then(() => setLoading(false));
+    }, [ visible ]);
+
+    return (
+        <>
+            <Modal
+                visible={visible}
+                onDismissed={() => {
+                    setVisible(false);
+                }}
+                css={tw`relative`}
+            >
+                <SpinnerOverlay visible={loading}/>
+                <h2 css={tw`mb-6 text-2xl text-neutral-100`}>Export Egg</h2>
+                <FlashMessageRender byKey={'egg:export'} css={tw`mb-6`}/>
+
+                <Editor
+                    overrides={tw`h-[32rem] rounded`}
+                    initialContent={content !== null ? JSON.stringify(content, null, '\t') : ''}
+                    mode={jsonLanguage}
+                />
+
+                <div css={tw`flex flex-wrap justify-end mt-4 sm:mt-6`}>
+                    <Button
+                        type={'button'}
+                        css={tw`w-full sm:w-auto sm:mr-2`}
+                        onClick={() => setVisible(false)}
+                        isSecondary
+                    >
+                        Close
+                    </Button>
+                    <Button
+                        css={tw`w-full sm:w-auto mt-4 sm:mt-0`}
+                        // onClick={submit}
+                        // TODO: When clicked, save as a JSON file.
+                    >
+                        Save
+                    </Button>
+                </div>
+            </Modal>
+
+            <Button
+                type={'button'}
+                size={'small'}
+                css={tw`px-4 py-0 whitespace-nowrap`}
+                className={className}
+                onClick={() => setVisible(true)}
+                isSecondary
+            >
+                Export
+            </Button>
+        </>
+    );
+};
diff --git a/resources/scripts/components/admin/nests/eggs/EggInstallContainer.tsx b/resources/scripts/components/admin/nests/eggs/EggInstallContainer.tsx
index 878f682a7..5864a7567 100644
--- a/resources/scripts/components/admin/nests/eggs/EggInstallContainer.tsx
+++ b/resources/scripts/components/admin/nests/eggs/EggInstallContainer.tsx
@@ -1,4 +1,4 @@
-import { Egg } from '@/api/admin/eggs/getEgg';
+import { useEggFromRoute } from '@/api/admin/egg';
 import updateEgg from '@/api/admin/eggs/updateEgg';
 import Field from '@/components/elements/Field';
 import useFlash from '@/plugins/useFlash';
@@ -18,9 +18,15 @@ interface Values {
     scriptInstall: string;
 }
 
-export default function EggInstallContainer ({ egg }: { egg: Egg }) {
+export default function EggInstallContainer () {
     const { clearFlashes, clearAndAddHttpError } = useFlash();
 
+    const { data: egg } = useEggFromRoute();
+
+    if (!egg) {
+        return null;
+    }
+
     let fetchFileContent: (() => Promise<string>) | null = null;
 
     const submit = async (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
@@ -50,7 +56,7 @@ export default function EggInstallContainer ({ egg }: { egg: Egg }) {
             }}
         >
             {({ isSubmitting, isValid }) => (
-                <AdminBox icon={faScroll} title={'Install Script'} padding={false}>
+                <AdminBox icon={faScroll} title={'Install Script'} noPadding>
                     <div css={tw`relative pb-4`}>
                         <SpinnerOverlay visible={isSubmitting}/>
 
diff --git a/resources/scripts/components/admin/nests/eggs/EggRouter.tsx b/resources/scripts/components/admin/nests/eggs/EggRouter.tsx
index 8ac6f15de..c2cee96fa 100644
--- a/resources/scripts/components/admin/nests/eggs/EggRouter.tsx
+++ b/resources/scripts/components/admin/nests/eggs/EggRouter.tsx
@@ -1,61 +1,37 @@
+import { useEggFromRoute } from '@/api/admin/egg';
 import EggInstallContainer from '@/components/admin/nests/eggs/EggInstallContainer';
 import EggVariablesContainer from '@/components/admin/nests/eggs/EggVariablesContainer';
-import React, { useEffect, useState } from 'react';
+import useFlash from '@/plugins/useFlash';
+import React, { useEffect } from 'react';
 import { useLocation } from 'react-router';
 import tw from 'twin.macro';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
-import { action, Action, Actions, createContextStore, useStoreActions } from 'easy-peasy';
-import getEgg, { Egg } from '@/api/admin/eggs/getEgg';
 import AdminContentBlock from '@/components/admin/AdminContentBlock';
 import Spinner from '@/components/elements/Spinner';
 import FlashMessageRender from '@/components/FlashMessageRender';
-import { ApplicationStore } from '@/state';
 import { SubNavigation, SubNavigationLink } from '@/components/admin/SubNavigation';
 import EggSettingsContainer from '@/components/admin/nests/eggs/EggSettingsContainer';
 
-interface ctx {
-    egg: Egg | undefined;
-    setEgg: Action<ctx, Egg | undefined>;
-}
-
-export const Context = createContextStore<ctx>({
-    egg: undefined,
-
-    setEgg: action((state, payload) => {
-        state.egg = payload;
-    }),
-});
-
 const EggRouter = () => {
     const location = useLocation();
-    const match = useRouteMatch<{ id?: string }>();
+    const match = useRouteMatch();
 
-    const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
-    const [ loading, setLoading ] = useState(true);
-
-    const egg = Context.useStoreState(state => state.egg);
-    const setEgg = Context.useStoreActions(actions => actions.setEgg);
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+    const { data: egg, error, isValidating, mutate } = useEggFromRoute();
 
     useEffect(() => {
-        clearFlashes('egg');
-
-        getEgg(Number(match.params?.id))
-            .then(egg => setEgg(egg))
-            .catch(error => {
-                console.error(error);
-                clearAndAddHttpError({ key: 'egg', error });
-            })
-            .then(() => setLoading(false));
+        mutate();
     }, []);
 
-    if (loading || egg === undefined) {
-        return (
-            <AdminContentBlock>
-                <FlashMessageRender byKey={'egg'} css={tw`mb-4`}/>
+    useEffect(() => {
+        if (!error) clearFlashes('egg');
+        if (error) clearAndAddHttpError({ key: 'egg', error });
+    }, [ error ]);
 
-                <div css={tw`w-full flex flex-col items-center justify-center`} style={{ height: '24rem' }}>
-                    <Spinner size={'base'}/>
-                </div>
+    if (!egg || (error && isValidating)) {
+        return (
+            <AdminContentBlock showFlashKey={'egg'}>
+                <Spinner size={'large'} centered/>
             </AdminContentBlock>
         );
     }
@@ -93,15 +69,15 @@ const EggRouter = () => {
 
             <Switch location={location}>
                 <Route path={`${match.path}`} exact>
-                    <EggSettingsContainer egg={egg}/>
+                    <EggSettingsContainer/>
                 </Route>
 
                 <Route path={`${match.path}/variables`} exact>
-                    <EggVariablesContainer egg={egg}/>
+                    <EggVariablesContainer/>
                 </Route>
 
                 <Route path={`${match.path}/install`} exact>
-                    <EggInstallContainer egg={egg}/>
+                    <EggInstallContainer/>
                 </Route>
             </Switch>
         </AdminContentBlock>
@@ -109,9 +85,5 @@ const EggRouter = () => {
 };
 
 export default () => {
-    return (
-        <Context.Provider>
-            <EggRouter/>
-        </Context.Provider>
-    );
+    return <EggRouter/>;
 };
diff --git a/resources/scripts/components/admin/nests/eggs/EggSettingsContainer.tsx b/resources/scripts/components/admin/nests/eggs/EggSettingsContainer.tsx
index f8dc1c365..70faac949 100644
--- a/resources/scripts/components/admin/nests/eggs/EggSettingsContainer.tsx
+++ b/resources/scripts/components/admin/nests/eggs/EggSettingsContainer.tsx
@@ -1,5 +1,7 @@
+import { useEggFromRoute } from '@/api/admin/egg';
 import updateEgg from '@/api/admin/eggs/updateEgg';
 import EggDeleteButton from '@/components/admin/nests/eggs/EggDeleteButton';
+import EggExportButton from '@/components/admin/nests/eggs/EggExportButton';
 import Button from '@/components/elements/Button';
 import Editor from '@/components/elements/Editor';
 import Field, { TextareaField } from '@/components/elements/Field';
@@ -12,13 +14,12 @@ import { faDocker } from '@fortawesome/free-brands-svg-icons';
 import { faEgg, faFireAlt, faMicrochip, faTerminal } from '@fortawesome/free-solid-svg-icons';
 import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import AdminBox from '@/components/admin/AdminBox';
-import { Egg } from '@/api/admin/eggs/getEgg';
 import { useHistory } from 'react-router-dom';
 import tw from 'twin.macro';
 import { object } from 'yup';
 import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
 
-function EggInformationContainer () {
+export function EggInformationContainer () {
     const { isSubmitting } = useFormikContext();
 
     return (
@@ -44,7 +45,13 @@ function EggInformationContainer () {
     );
 }
 
-function EggDetailsContainer ({ egg }: { egg: Egg }) {
+function EggDetailsContainer () {
+    const { data: egg } = useEggFromRoute();
+
+    if (!egg) {
+        return null;
+    }
+
     return (
         <AdminBox icon={faEgg} title={'Egg Details'} css={tw`relative`}>
             <div css={tw`mb-6`}>
@@ -72,7 +79,7 @@ function EggDetailsContainer ({ egg }: { egg: Egg }) {
     );
 }
 
-function EggStartupContainer ({ className }: { className?: string }) {
+export function EggStartupContainer ({ className }: { className?: string }) {
     const { isSubmitting } = useFormikContext();
 
     return (
@@ -90,7 +97,7 @@ function EggStartupContainer ({ className }: { className?: string }) {
     );
 }
 
-function EggImageContainer () {
+export function EggImageContainer () {
     const { isSubmitting } = useFormikContext();
 
     return (
@@ -107,7 +114,7 @@ function EggImageContainer () {
     );
 }
 
-function EggLifecycleContainer () {
+export function EggLifecycleContainer () {
     const { isSubmitting } = useFormikContext();
 
     return (
@@ -115,8 +122,8 @@ function EggLifecycleContainer () {
             <SpinnerOverlay visible={isSubmitting}/>
 
             <Field
-                id={'stopCommand'}
-                name={'stopCommand'}
+                id={'configStop'}
+                name={'configStop'}
                 label={'Stop Command'}
                 type={'text'}
                 css={tw`mb-1`}
@@ -127,17 +134,16 @@ function EggLifecycleContainer () {
 
 interface EggProcessContainerProps {
     className?: string;
-    egg: Egg;
 }
 
-interface EggProcessContainerRef {
+export interface EggProcessContainerRef {
     getStartupConfiguration: () => Promise<string | null>;
     getFilesConfiguration: () => Promise<string | null>;
 }
 
-const EggProcessContainer = forwardRef<any, EggProcessContainerProps>(
-    function EggProcessContainer ({ className, egg }, ref) {
-        const { isSubmitting } = useFormikContext();
+export const EggProcessContainer = forwardRef<any, EggProcessContainerProps>(
+    function EggProcessContainer ({ className }, ref) {
+        const { isSubmitting, values } = useFormikContext<Values>();
 
         let fetchStartupConfiguration: (() => Promise<string>) | null = null;
         let fetchFilesConfiguration: (() => Promise<string>) | null = null;
@@ -162,11 +168,11 @@ const EggProcessContainer = forwardRef<any, EggProcessContainerProps>(
             <AdminBox icon={faMicrochip} title={'Process Configuration'} css={tw`relative`} className={className}>
                 <SpinnerOverlay visible={isSubmitting}/>
 
-                <div css={tw`mb-6`}>
+                <div css={tw`mb-5`}>
                     <Label>Startup Configuration</Label>
                     <Editor
                         mode={jsonLanguage}
-                        initialContent={JSON.stringify(egg.configStartup, null, '\t') || ''}
+                        initialContent={values.configStartup}
                         overrides={tw`h-32 rounded`}
                         fetchContent={value => {
                             fetchStartupConfiguration = value;
@@ -178,7 +184,7 @@ const EggProcessContainer = forwardRef<any, EggProcessContainerProps>(
                     <Label>Configuration Files</Label>
                     <Editor
                         mode={jsonLanguage}
-                        initialContent={JSON.stringify(egg.configFiles, null, '\t') || ''}
+                        initialContent={values.configFiles}
                         overrides={tw`h-48 rounded`}
                         fetchContent={value => {
                             fetchFilesConfiguration = value;
@@ -195,17 +201,23 @@ interface Values {
     description: string;
     startup: string;
     dockerImages: string;
-    stopCommand: string;
+    configStop: string;
     configStartup: string;
     configFiles: string;
 }
 
-export default function EggSettingsContainer ({ egg }: { egg: Egg }) {
+export default function EggSettingsContainer () {
     const history = useHistory();
 
+    const ref = useRef<EggProcessContainerRef>();
+
     const { clearFlashes, clearAndAddHttpError } = useFlash();
 
-    const ref = useRef<EggProcessContainerRef>();
+    const { data: egg } = useEggFromRoute();
+
+    if (!egg) {
+        return null;
+    }
 
     const submit = async (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
         clearFlashes('egg');
@@ -229,9 +241,9 @@ export default function EggSettingsContainer ({ egg }: { egg: Egg }) {
                 description: egg.description || '',
                 startup: egg.startup,
                 dockerImages: egg.dockerImages.join('\n'),
-                stopCommand: egg.configStop || '',
-                configStartup: '',
-                configFiles: '',
+                configStop: egg.configStop || '',
+                configStartup: JSON.stringify(egg.configStartup, null, '\t') || '',
+                configFiles: JSON.stringify(egg.configFiles, null, '\t') || '',
             }}
             validationSchema={object().shape({
             })}
@@ -240,7 +252,7 @@ export default function EggSettingsContainer ({ egg }: { egg: Egg }) {
                 <Form>
                     <div css={tw`grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6 mb-6`}>
                         <EggInformationContainer/>
-                        <EggDetailsContainer egg={egg}/>
+                        <EggDetailsContainer/>
                     </div>
 
                     <EggStartupContainer css={tw`mb-6`}/>
@@ -250,19 +262,16 @@ export default function EggSettingsContainer ({ egg }: { egg: Egg }) {
                         <EggLifecycleContainer/>
                     </div>
 
-                    <EggProcessContainer
-                        ref={ref}
-                        egg={egg}
-                        css={tw`mb-6`}
-                    />
+                    <EggProcessContainer ref={ref} css={tw`mb-6`}/>
 
-                    <div css={tw`bg-neutral-700 rounded shadow-md py-2 px-6 mb-16`}>
+                    <div css={tw`bg-neutral-700 rounded shadow-md px-4 xl:px-5 py-4 mb-16`}>
                         <div css={tw`flex flex-row`}>
                             <EggDeleteButton
                                 eggId={egg.id}
                                 onDeleted={() => history.push('/admin/nests')}
                             />
-                            <Button type="submit" size="small" css={tw`ml-auto`} disabled={isSubmitting || !isValid}>
+                            <EggExportButton css={tw`ml-auto mr-4`}/>
+                            <Button type="submit" size="small" disabled={isSubmitting || !isValid}>
                                 Save Changes
                             </Button>
                         </div>
diff --git a/resources/scripts/components/admin/nests/eggs/EggVariablesContainer.tsx b/resources/scripts/components/admin/nests/eggs/EggVariablesContainer.tsx
index 76a88ed33..0ddef6616 100644
--- a/resources/scripts/components/admin/nests/eggs/EggVariablesContainer.tsx
+++ b/resources/scripts/components/admin/nests/eggs/EggVariablesContainer.tsx
@@ -1,11 +1,210 @@
-import React from 'react';
+import deleteEggVariable from '@/api/admin/eggs/deleteEggVariable';
+import { NoItems } from '@/components/admin/AdminTable';
+import ConfirmationModal from '@/components/elements/ConfirmationModal';
+import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
+import React, { useState } from 'react';
+import tw from 'twin.macro';
+import { array, boolean, object, string } from 'yup';
+import { EggVariable, useEggFromRoute } from '@/api/admin/egg';
+import updateEggVariables from '@/api/admin/eggs/updateEggVariables';
+import NewVariableButton from '@/components/admin/nests/eggs/NewVariableButton';
 import AdminBox from '@/components/admin/AdminBox';
-import { Egg } from '@/api/admin/eggs/getEgg';
+import Button from '@/components/elements/Button';
+import Checkbox from '@/components/elements/Checkbox';
+import Field, { FieldRow, TextareaField } from '@/components/elements/Field';
+import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
+import useFlash from '@/plugins/useFlash';
+import { TrashIcon } from '@heroicons/react/outline';
 
-export default ({ egg }: { egg: Egg }) => {
+export const validationSchema = object().shape({
+    name: string().required().min(1).max(191),
+    description: string(),
+    environmentVariable: string().required().min(1).max(191),
+    defaultValue: string(),
+    isUserViewable: boolean().required(),
+    isUserEditable: boolean().required(),
+    rules: string().required(),
+});
+
+export function EggVariableForm ({ prefix }: { prefix: string }) {
     return (
-        <AdminBox title={'Variables'}>
-            {egg.name}
+        <>
+            <Field
+                id={`${prefix}name`}
+                name={`${prefix}name`}
+                label={'Name'}
+                type={'text'}
+                css={tw`mb-6`}
+            />
+
+            <TextareaField
+                id={`${prefix}description`}
+                name={`${prefix}description`}
+                label={'Description'}
+                rows={3}
+                css={tw`mb-4`}
+            />
+
+            <FieldRow>
+                <Field
+                    id={`${prefix}environmentVariable`}
+                    name={`${prefix}environmentVariable`}
+                    label={'Environment Variable'}
+                    type={'text'}
+                />
+
+                <Field
+                    id={`${prefix}defaultValue`}
+                    name={`${prefix}defaultValue`}
+                    label={'Default Value'}
+                    type={'text'}
+                />
+            </FieldRow>
+
+            <div css={tw`flex flex-row mb-6`}>
+                <Checkbox
+                    id={`${prefix}isUserViewable`}
+                    name={`${prefix}isUserViewable`}
+                    label={'User Viewable'}
+                />
+
+                <Checkbox
+                    id={`${prefix}isUserEditable`}
+                    name={`${prefix}isUserEditable`}
+                    label={'User Editable'}
+                    css={tw`ml-auto`}
+                />
+            </div>
+
+            <Field
+                id={`${prefix}rules`}
+                name={`${prefix}rules`}
+                label={'Validation Rules'}
+                type={'text'}
+                css={tw`mb-2`}
+            />
+        </>
+    );
+}
+
+function EggVariableDeleteButton ({ onClick }: { onClick: (success: () => void) => void }) {
+    const [ visible, setVisible ] = useState(false);
+    const [ loading, setLoading ] = useState(false);
+
+    const onDelete = () => {
+        setLoading(true);
+
+        onClick(() => {
+            //setLoading(false);
+        });
+    };
+
+    return (
+        <>
+            <ConfirmationModal
+                visible={visible}
+                title={'Delete variable?'}
+                buttonText={'Yes, delete variable'}
+                onConfirmed={onDelete}
+                showSpinnerOverlay={loading}
+                onModalDismissed={() => setVisible(false)}
+            >
+                Are you sure you want to delete this variable?  Deleting this variable will delete it from every server
+                using this egg.
+            </ConfirmationModal>
+
+            <button
+                type={'button'}
+                css={tw`ml-auto text-neutral-500 hover:text-neutral-300`}
+                onClick={() => setVisible(true)}
+            >
+                <TrashIcon css={tw`h-5 w-5`}/>
+            </button>
+        </>
+    );
+}
+
+function EggVariableBox ({ onDeleteClick, variable, prefix }: { onDeleteClick: (success: () => void) => void, variable: EggVariable, prefix: string }) {
+    const { isSubmitting } = useFormikContext();
+
+    return (
+        <AdminBox
+            css={tw`relative w-full`}
+            title={<p css={tw`text-sm uppercase`}>{variable.name}</p>}
+            button={<EggVariableDeleteButton onClick={onDeleteClick}/>}
+        >
+            <SpinnerOverlay visible={isSubmitting}/>
+
+            <EggVariableForm prefix={prefix}/>
         </AdminBox>
     );
-};
+}
+
+export default function EggVariablesContainer () {
+    const { clearAndAddHttpError } = useFlash();
+
+    const { data: egg, mutate } = useEggFromRoute();
+
+    if (!egg) {
+        return null;
+    }
+
+    const submit = (values: EggVariable[], { setSubmitting }: FormikHelpers<EggVariable[]>) => {
+        updateEggVariables(egg.id, values)
+            .then(async () => await mutate())
+            .catch(error => clearAndAddHttpError({ key: 'egg', error }))
+            .then(() => setSubmitting(false));
+    };
+
+    return (
+        <Formik
+            onSubmit={submit}
+            initialValues={egg.relationships.variables}
+            validationSchema={array().of(validationSchema)}
+        >
+            {({ isSubmitting, isValid }) => (
+                <Form>
+                    <div css={tw`flex flex-col mb-16`}>
+                        {egg.relationships.variables?.length === 0 ?
+                            <NoItems css={tw`bg-neutral-700 rounded-md shadow-md`}/>
+                            :
+                            <div css={tw`grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 gap-x-8 gap-y-6`}>
+                                {egg.relationships.variables.map((v, i) => (
+                                    <EggVariableBox
+                                        key={i}
+                                        prefix={`[${i}].`}
+                                        variable={v}
+                                        onDeleteClick={(success) => {
+                                            deleteEggVariable(egg.id, v.id)
+                                                .then(async () => {
+                                                    await mutate(egg => ({
+                                                        ...egg!,
+                                                        relationships: {
+                                                            ...egg!.relationships,
+                                                            variables: egg!.relationships.variables!.filter(v2 => v.id === v2.id),
+                                                        },
+                                                    }));
+                                                    success();
+                                                })
+                                                .catch(error => clearAndAddHttpError({ key: 'egg', error }));
+                                        }}
+                                    />
+                                ))}
+                            </div>
+                        }
+
+                        <div css={tw`bg-neutral-700 rounded shadow-md py-2 px-4 mt-6`}>
+                            <div css={tw`flex flex-row`}>
+                                <NewVariableButton/>
+
+                                <Button type={'submit'} size={'small'} css={tw`ml-auto`} disabled={isSubmitting || !isValid}>
+                                    Save Changes
+                                </Button>
+                            </div>
+                        </div>
+                    </div>
+                </Form>
+            )}
+        </Formik>
+    );
+}
diff --git a/resources/scripts/components/admin/nests/eggs/NewVariableButton.tsx b/resources/scripts/components/admin/nests/eggs/NewVariableButton.tsx
new file mode 100644
index 000000000..018912abf
--- /dev/null
+++ b/resources/scripts/components/admin/nests/eggs/NewVariableButton.tsx
@@ -0,0 +1,93 @@
+import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
+import React, { useState } from 'react';
+import tw from 'twin.macro';
+import createEggVariable, { CreateEggVariable } from '@/api/admin/eggs/createEggVariable';
+import { useEggFromRoute } from '@/api/admin/egg';
+import { EggVariableForm, validationSchema } from '@/components/admin/nests/eggs/EggVariablesContainer';
+import Modal from '@/components/elements/Modal';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import Button from '@/components/elements/Button';
+import useFlash from '@/plugins/useFlash';
+
+export default function NewVariableButton () {
+    const { setValues } = useFormikContext();
+    const [ visible, setVisible ] = useState(false);
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+
+    const { data: egg, mutate } = useEggFromRoute();
+
+    if (!egg) {
+        return null;
+    }
+
+    const submit = (values: CreateEggVariable, { setSubmitting }: FormikHelpers<CreateEggVariable>) => {
+        clearFlashes('variable:create');
+
+        createEggVariable(egg.id, values)
+            .then(async (variable) => {
+                setValues([ ...egg.relationships.variables, variable ]);
+                await mutate(egg => ({ ...egg!, relationships: { ...egg!.relationships, variables: [ ...egg!.relationships.variables, variable ] } }));
+                setVisible(false);
+            })
+            .catch(error => {
+                clearAndAddHttpError({ key: 'variable:create', error });
+                setSubmitting(false);
+            });
+    };
+
+    return (
+        <>
+            <Formik
+                onSubmit={submit}
+                initialValues={{
+                    name: '',
+                    description: '',
+                    environmentVariable: '',
+                    defaultValue: '',
+                    isUserViewable: false,
+                    isUserEditable: false,
+                    rules: '',
+                }}
+                validationSchema={validationSchema}
+            >
+                {({ isSubmitting, isValid, resetForm }) => (
+                    <Modal
+                        visible={visible}
+                        dismissable={!isSubmitting}
+                        showSpinnerOverlay={isSubmitting}
+                        onDismissed={() => {
+                            resetForm();
+                            setVisible(false);
+                        }}
+                    >
+                        <FlashMessageRender byKey={'variable:create'} css={tw`mb-6`}/>
+
+                        <h2 css={tw`mb-6 text-2xl text-neutral-100`}>New Variable</h2>
+
+                        <Form css={tw`m-0`}>
+                            <EggVariableForm prefix={''}/>
+
+                            <div css={tw`flex flex-wrap justify-end mt-6`}>
+                                <Button
+                                    type={'button'}
+                                    isSecondary
+                                    css={tw`w-full sm:w-auto sm:mr-2`}
+                                    onClick={() => setVisible(false)}
+                                >
+                                    Cancel
+                                </Button>
+                                <Button css={tw`w-full mt-4 sm:w-auto sm:mt-0`} type={'submit'} disabled={isSubmitting || !isValid}>
+                                    Create Variable
+                                </Button>
+                            </div>
+                        </Form>
+                    </Modal>
+                )}
+            </Formik>
+
+            <Button type={'button'} color={'green'} onClick={() => setVisible(true)}>
+                New Variable
+            </Button>
+        </>
+    );
+}
diff --git a/resources/scripts/components/admin/nodes/NodeAllocationContainer.tsx b/resources/scripts/components/admin/nodes/NodeAllocationContainer.tsx
index eef598835..9e6c2f494 100644
--- a/resources/scripts/components/admin/nodes/NodeAllocationContainer.tsx
+++ b/resources/scripts/components/admin/nodes/NodeAllocationContainer.tsx
@@ -13,12 +13,12 @@ export default () => {
         <>
             <div css={tw`w-full grid grid-cols-12 gap-x-8`}>
                 <div css={tw`w-full flex col-span-8`}>
-                    <AllocationTable nodeId={match.params.id}/>
+                    <AllocationTable nodeId={Number(match.params.id)}/>
                 </div>
 
                 <div css={tw`w-full flex col-span-4`}>
                     <AdminBox icon={faNetworkWired} title={'Allocations'} css={tw`h-auto w-full`}>
-                        <CreateAllocationForm nodeId={match.params.id}/>
+                        <CreateAllocationForm nodeId={Number(match.params.id)}/>
                     </AdminBox>
                 </div>
             </div>
diff --git a/resources/scripts/components/admin/nodes/allocations/AllocationTable.tsx b/resources/scripts/components/admin/nodes/allocations/AllocationTable.tsx
index 57b4132dc..aa93b37bc 100644
--- a/resources/scripts/components/admin/nodes/allocations/AllocationTable.tsx
+++ b/resources/scripts/components/admin/nodes/allocations/AllocationTable.tsx
@@ -5,6 +5,7 @@ import tw from 'twin.macro';
 import getAllocations, { Context as AllocationsContext, Filters } from '@/api/admin/nodes/allocations/getAllocations';
 import AdminCheckbox from '@/components/admin/AdminCheckbox';
 import AdminTable, { ContentWrapper, Loading, NoItems, Pagination, TableBody, TableHead, TableHeader, useTableHooks } from '@/components/admin/AdminTable';
+import DeleteAllocationButton from '@/components/admin/nodes/allocations/DeleteAllocationButton';
 import CopyOnClick from '@/components/elements/CopyOnClick';
 import useFlash from '@/plugins/useFlash';
 
@@ -29,7 +30,7 @@ function RowCheckbox ({ id }: { id: number }) {
 }
 
 interface Props {
-    nodeId: string;
+    nodeId: number;
     filters?: Filters;
 }
 
@@ -37,7 +38,7 @@ function AllocationsTable ({ nodeId, filters }: Props) {
     const { clearFlashes, clearAndAddHttpError } = useFlash();
 
     const { page, setPage, setFilters, sort, setSort, sortDirection } = useContext(AllocationsContext);
-    const { data: allocations, error, isValidating } = getAllocations(nodeId, [ 'server' ]);
+    const { data: allocations, error, isValidating, mutate } = getAllocations(nodeId, [ 'server' ]);
 
     const length = allocations?.items?.length || 0;
 
@@ -49,7 +50,7 @@ function AllocationsTable ({ nodeId, filters }: Props) {
     };
 
     const onSearch = (query: string): Promise<void> => {
-        return new Promise((resolve) => {
+        return new Promise(resolve => {
             if (query.length < 2) {
                 setFilters(filters || null);
             } else {
@@ -87,6 +88,7 @@ function AllocationsTable ({ nodeId, filters }: Props) {
                                 <TableHeader name={'Alias'}/>
                                 <TableHeader name={'Port'} direction={sort === 'port' ? (sortDirection ? 1 : 2) : null} onClick={() => setSort('port')}/>
                                 <TableHeader name={'Assigned To'}/>
+                                <TableHeader/>
                             </TableHead>
 
                             <TableBody>
@@ -128,6 +130,24 @@ function AllocationsTable ({ nodeId, filters }: Props) {
                                             :
                                             <td/>
                                         }
+
+                                        <td>
+                                            <DeleteAllocationButton
+                                                nodeId={nodeId}
+                                                allocationId={allocation.id}
+                                                onDeleted={async () => {
+                                                    await mutate(allocations => ({
+                                                        pagination: allocations!.pagination,
+                                                        items: allocations!.items.filter(a => a.id === allocation.id),
+                                                    }));
+
+                                                    // Go back a page if no more items will exist on the current page.
+                                                    if (allocations?.items.length - 1 % 10 === 0) {
+                                                        setPage(p => p - 1);
+                                                    }
+                                                }}
+                                            />
+                                        </td>
                                     </tr>
                                 ))
                                 }
diff --git a/resources/scripts/components/admin/nodes/allocations/CreateAllocationForm.tsx b/resources/scripts/components/admin/nodes/allocations/CreateAllocationForm.tsx
index dc95d73f1..ac3704564 100644
--- a/resources/scripts/components/admin/nodes/allocations/CreateAllocationForm.tsx
+++ b/resources/scripts/components/admin/nodes/allocations/CreateAllocationForm.tsx
@@ -19,7 +19,7 @@ const distinct = (value: any, index: any, self: any) => {
     return self.indexOf(value) === index;
 };
 
-function CreateAllocationForm ({ nodeId }: { nodeId: string | number }) {
+function CreateAllocationForm ({ nodeId }: { nodeId: number }) {
     const [ ips, setIPs ] = useState<Option[]>([]);
     const [ ports ] = useState<Option[]>([]);
 
@@ -66,51 +66,49 @@ function CreateAllocationForm ({ nodeId }: { nodeId: string | number }) {
                 ports: array(number()).min(1, 'You must select at least one port.'),
             })}
         >
-            {
-                ({ isSubmitting, isValid }) => (
-                    <Form>
-                        <SelectField
-                            id={'ips'}
-                            name={'ips'}
-                            label={'IPs and CIDRs'}
-                            options={ips}
-                            isValidNewOption={isValidIP}
-                            isMulti
-                            isSearchable
-                            isCreatable
-                            css={tw`mb-6`}
+            {({ isSubmitting, isValid }) => (
+                <Form>
+                    <SelectField
+                        id={'ips'}
+                        name={'ips'}
+                        label={'IPs and CIDRs'}
+                        options={ips}
+                        isValidNewOption={isValidIP}
+                        isMulti
+                        isSearchable
+                        isCreatable
+                        css={tw`mb-6`}
+                    />
+
+                    <SelectField
+                        id={'ports'}
+                        name={'ports'}
+                        label={'Ports'}
+                        options={ports}
+                        isValidNewOption={isValidPort}
+                        isMulti
+                        isSearchable
+                        isCreatable
+                    />
+
+                    <div css={tw`mt-6`}>
+                        <Field
+                            id={'alias'}
+                            name={'alias'}
+                            label={'Alias'}
+                            type={'text'}
                         />
+                    </div>
 
-                        <SelectField
-                            id={'ports'}
-                            name={'ports'}
-                            label={'Ports'}
-                            options={ports}
-                            isValidNewOption={isValidPort}
-                            isMulti
-                            isSearchable
-                            isCreatable
-                        />
-
-                        <div css={tw`mt-6`}>
-                            <Field
-                                id={'alias'}
-                                name={'alias'}
-                                label={'Alias'}
-                                type={'text'}
-                            />
+                    <div css={tw`w-full flex flex-row items-center mt-6`}>
+                        <div css={tw`flex ml-auto`}>
+                            <Button type={'submit'} disabled={isSubmitting || !isValid}>
+                                Create Allocations
+                            </Button>
                         </div>
-
-                        <div css={tw`w-full flex flex-row items-center mt-6`}>
-                            <div css={tw`flex ml-auto`}>
-                                <Button type={'submit'} disabled={isSubmitting || !isValid}>
-                                    Create Allocations
-                                </Button>
-                            </div>
-                        </div>
-                    </Form>
-                )
-            }
+                    </div>
+                </Form>
+            )}
         </Formik>
     );
 }
diff --git a/resources/scripts/components/admin/nodes/allocations/DeleteAllocationButton.tsx b/resources/scripts/components/admin/nodes/allocations/DeleteAllocationButton.tsx
new file mode 100644
index 000000000..322def5d1
--- /dev/null
+++ b/resources/scripts/components/admin/nodes/allocations/DeleteAllocationButton.tsx
@@ -0,0 +1,62 @@
+import React, { useState } from 'react';
+import { Actions, useStoreActions } from 'easy-peasy';
+import { ApplicationStore } from '@/state';
+import tw from 'twin.macro';
+import Button from '@/components/elements/Button';
+import ConfirmationModal from '@/components/elements/ConfirmationModal';
+import deleteAllocation from '@/api/admin/nodes/allocations/deleteAllocation';
+
+interface Props {
+    nodeId: number;
+    allocationId: number;
+    onDeleted?: () => void;
+}
+
+export default ({ nodeId, allocationId, onDeleted }: Props) => {
+    const [ visible, setVisible ] = useState(false);
+    const [ loading, setLoading ] = useState(false);
+
+    const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
+
+    const onDelete = () => {
+        setLoading(true);
+        clearFlashes('allocation');
+
+        deleteAllocation(nodeId, allocationId)
+            .then(() => {
+                setLoading(false);
+                setVisible(false);
+                if (onDeleted !== undefined) {
+                    onDeleted();
+                }
+            })
+            .catch(error => {
+                console.error(error);
+                clearAndAddHttpError({ key: 'allocation', error });
+
+                setLoading(false);
+                setVisible(false);
+            });
+    };
+
+    return (
+        <>
+            <ConfirmationModal
+                visible={visible}
+                title={'Delete allocation?'}
+                buttonText={'Yes, delete allocation'}
+                onConfirmed={onDelete}
+                showSpinnerOverlay={loading}
+                onModalDismissed={() => setVisible(false)}
+            >
+                Are you sure you want to delete this allocation?
+            </ConfirmationModal>
+
+            <Button type={'button'} size={'inline'} color={'red'} onClick={() => setVisible(true)}>
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" css={tw`h-5 w-5`}>
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                </svg>
+            </Button>
+        </>
+    );
+};
diff --git a/resources/scripts/components/admin/roles/RoleEditContainer.tsx b/resources/scripts/components/admin/roles/RoleEditContainer.tsx
index 912da287c..747c9a828 100644
--- a/resources/scripts/components/admin/roles/RoleEditContainer.tsx
+++ b/resources/scripts/components/admin/roles/RoleEditContainer.tsx
@@ -109,7 +109,7 @@ const EditInformationContainer = () => {
 
                                     <div css={tw`flex ml-auto`}>
                                         <Button type={'submit'} disabled={isSubmitting || !isValid}>
-                                            Save
+                                            Save Changes
                                         </Button>
                                     </div>
                                 </div>
diff --git a/resources/scripts/components/admin/servers/EggSelect.tsx b/resources/scripts/components/admin/servers/EggSelect.tsx
index 115633ca0..00aabd7d1 100644
--- a/resources/scripts/components/admin/servers/EggSelect.tsx
+++ b/resources/scripts/components/admin/servers/EggSelect.tsx
@@ -1,70 +1,69 @@
+import { useField } from 'formik';
+import React, { useEffect, useState } from 'react';
+import { WithRelationships } from '@/api/admin';
+import { Egg, searchEggs } from '@/api/admin/egg';
 import Label from '@/components/elements/Label';
 import Select from '@/components/elements/Select';
-import { useFormikContext } from 'formik';
-import React, { useEffect, useState } from 'react';
-import { Egg } from '@/api/admin/eggs/getEgg';
-import searchEggs from '@/api/admin/nests/searchEggs';
 
-export default ({ nestId, egg, setEgg }: { nestId: number | null; egg: Egg | null, setEgg: (value: Egg | null) => void }) => {
-    const { setFieldValue } = useFormikContext();
+interface Props {
+    nestId?: number;
+    selectedEggId?: number;
+    onEggSelect: (egg: Egg | null) => void;
+}
 
-    const [ eggs, setEggs ] = useState<Egg[]>([]);
+export default ({ nestId, selectedEggId, onEggSelect }: Props) => {
+    const [ , , { setValue, setTouched } ] = useField<Record<string, string | undefined>>('environment');
+    const [ eggs, setEggs ] = useState<WithRelationships<Egg, 'variables'>[] | null>(null);
 
-    /**
-     * So you may be asking yourself, "what cluster-fuck of code is this?"
-     *
-     * Well, this code makes sure that when the egg changes, that the environment
-     * object has empty string values instead of undefined so React doesn't think
-     * the variable fields are uncontrolled.
-     */
-    const setEgg2 = (newEgg: Egg | null) => {
-        if (newEgg === null) {
-            setEgg(null);
+    const selectEgg = (egg: Egg | null) => {
+        if (egg === null) {
+            onEggSelect(null);
             return;
         }
 
-        // Reset all variables to be empty, don't inherit the previous values.
-        const newVariables = newEgg?.relations.variables;
-        newVariables?.forEach(v => setFieldValue('environment.' + v.envVariable, ''));
-        const variables = egg?.relations.variables?.filter(v => newVariables?.find(v2 => v2.envVariable === v.envVariable) === undefined);
+        // Clear values
+        setValue({});
+        setTouched(true);
 
-        setEgg(newEgg);
+        onEggSelect(egg);
 
-        // Clear any variables that don't exist on the new egg.
-        variables?.forEach(v => setFieldValue('environment.' + v.envVariable, undefined));
+        const values: Record<string, any> = {};
+        egg.relationships.variables?.forEach(v => { values[v.environmentVariable] = v.defaultValue; });
+        setValue(values);
+        setTouched(true);
     };
 
     useEffect(() => {
-        if (nestId === null) {
+        if (!nestId) {
+            setEggs(null);
             return;
         }
 
-        searchEggs(nestId, {}, [ 'variables' ])
+        searchEggs(nestId, {})
             .then(eggs => {
                 setEggs(eggs);
-                if (eggs.length < 1) {
-                    setEgg2(null);
-                    return;
-                }
-                setEgg2(eggs[0]);
+                selectEgg(eggs[0] || null);
             })
             .catch(error => console.error(error));
     }, [ nestId ]);
 
+    const onSelectChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+        selectEgg(eggs?.find(egg => egg.id.toString() === e.currentTarget.value) || null);
+    };
+
     return (
         <>
             <Label>Egg</Label>
-            <Select
-                defaultValue={egg?.id || undefined}
-                id={'eggId'}
-                name={'eggId'}
-                onChange={e => setEgg2(eggs.find(egg => egg.id.toString() === e.currentTarget.value) || null)}
-            >
-                {eggs.map(v => (
-                    <option key={v.id} value={v.id.toString()}>
-                        {v.name}
-                    </option>
-                ))}
+            <Select id={'eggId'} name={'eggId'} defaultValue={selectedEggId} onChange={onSelectChange}>
+                {!eggs ?
+                    <option disabled>Loading...</option>
+                    :
+                    eggs.map(v => (
+                        <option key={v.id} value={v.id.toString()}>
+                            {v.name}
+                        </option>
+                    ))
+                }
             </Select>
         </>
     );
diff --git a/resources/scripts/components/admin/servers/NestSelect.tsx b/resources/scripts/components/admin/servers/NestSelect.tsx
deleted file mode 100644
index 26e6d8b97..000000000
--- a/resources/scripts/components/admin/servers/NestSelect.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import Label from '@/components/elements/Label';
-import Select from '@/components/elements/Select';
-import React, { useEffect, useState } from 'react';
-import { Nest } from '@/api/admin/nests/getNests';
-import searchNests from '@/api/admin/nests/searchNests';
-
-export default ({ nestId, setNestId }: { nestId: number | null; setNestId: (value: number | null) => void }) => {
-    const [ nests, setNests ] = useState<Nest[] | null>(null);
-
-    useEffect(() => {
-        searchNests({})
-            .then(nests => setNests(nests))
-            .catch(error => console.error(error));
-    }, []);
-
-    return (
-        <>
-            <Label>Nest</Label>
-            <Select value={nestId || undefined} onChange={e => setNestId(Number(e.currentTarget.value))}>
-                {nests?.map(v => (
-                    <option key={v.id} value={v.id.toString()}>
-                        {v.name}
-                    </option>
-                ))}
-            </Select>
-        </>
-    );
-};
diff --git a/resources/scripts/components/admin/servers/NestSelector.tsx b/resources/scripts/components/admin/servers/NestSelector.tsx
new file mode 100644
index 000000000..86adf4d5b
--- /dev/null
+++ b/resources/scripts/components/admin/servers/NestSelector.tsx
@@ -0,0 +1,41 @@
+import Label from '@/components/elements/Label';
+import Select from '@/components/elements/Select';
+import React, { useEffect, useState } from 'react';
+import { Nest, searchNests } from '@/api/admin/nest';
+
+interface Props {
+    selectedNestId?: number;
+    onNestSelect: (nest: number) => void;
+}
+
+export default ({ selectedNestId, onNestSelect }: Props) => {
+    const [ nests, setNests ] = useState<Nest[] | null>(null);
+
+    useEffect(() => {
+        searchNests({})
+            .then(nests => {
+                setNests(nests);
+                if (selectedNestId === 0 && nests.length > 0) {
+                    onNestSelect(nests[0].id);
+                }
+            })
+            .catch(error => console.error(error));
+    }, []);
+
+    return (
+        <>
+            <Label>Nest</Label>
+            <Select value={selectedNestId} onChange={e => onNestSelect(Number(e.currentTarget.value))}>
+                {!nests ?
+                    <option disabled>Loading...</option>
+                    :
+                    nests?.map(v => (
+                        <option key={v.uuid} value={v.id.toString()}>
+                            {v.name}
+                        </option>
+                    ))
+                }
+            </Select>
+        </>
+    );
+};
diff --git a/resources/scripts/components/admin/servers/NewServerContainer.tsx b/resources/scripts/components/admin/servers/NewServerContainer.tsx
index 2b121915c..e92f46cd6 100644
--- a/resources/scripts/components/admin/servers/NewServerContainer.tsx
+++ b/resources/scripts/components/admin/servers/NewServerContainer.tsx
@@ -1,8 +1,159 @@
-import React from 'react';
+import { Egg } from '@/api/admin/egg';
+import AdminBox from '@/components/admin/AdminBox';
+import NodeSelect from '@/components/admin/servers/NodeSelect';
+import { ServerImageContainer, ServerServiceContainer, ServerVariableContainer } from '@/components/admin/servers/ServerStartupContainer';
+import BaseSettingsBox from '@/components/admin/servers/settings/BaseSettingsBox';
+import FeatureLimitsBox from '@/components/admin/servers/settings/FeatureLimitsBox';
+import ServerResourceBox from '@/components/admin/servers/settings/ServerResourceBox';
+import Button from '@/components/elements/Button';
+import Field from '@/components/elements/Field';
+import FormikSwitch from '@/components/elements/FormikSwitch';
+import Label from '@/components/elements/Label';
+import Select from '@/components/elements/Select';
+import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import useFlash from '@/plugins/useFlash';
+import { faNetworkWired } from '@fortawesome/free-solid-svg-icons';
+import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
+import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router-dom';
 import tw from 'twin.macro';
 import AdminContentBlock from '@/components/admin/AdminContentBlock';
+import { object } from 'yup';
+import createServer, { CreateServerRequest } from '@/api/admin/servers/createServer';
+import { Allocation, Node, getAllocations } from '@/api/admin/node';
+
+function InternalForm () {
+    const { isSubmitting, isValid, setFieldValue, values: { environment } } = useFormikContext<CreateServerRequest>();
+
+    const [ egg, setEgg ] = useState<Egg | null>(null);
+    const [ node, setNode ] = useState<Node | null>(null);
+    const [ allocations, setAllocations ] = useState<Allocation[] | null>(null);
+
+    useEffect(() => {
+        if (egg === null) {
+            return;
+        }
+
+        setFieldValue('eggId', egg.id);
+        setFieldValue('startup', '');
+        setFieldValue('image', egg.dockerImages.length > 0 ? egg.dockerImages[0] : '');
+    }, [ egg ]);
+
+    useEffect(() => {
+        if (node === null) {
+            return;
+        }
+
+        // server_id: 0 filters out assigned allocations
+        getAllocations(node.id, { filters: { server_id: '0' } })
+            .then(setAllocations);
+    }, [ node ]);
+
+    return (
+        <Form>
+            <div css={tw`grid grid-cols-2 gap-y-6 gap-x-8 mb-16`}>
+                <div css={tw`grid grid-cols-1 gap-y-6 col-span-2 md:col-span-1`}>
+                    <BaseSettingsBox>
+                        <NodeSelect node={node} setNode={setNode}/>
+                        <div css={tw`xl:col-span-2 bg-neutral-800 border border-neutral-900 shadow-inner p-4 rounded`}>
+                            <FormikSwitch
+                                name={'startOnCompletion'}
+                                label={'Start after installation'}
+                                description={'Should the server be automatically started after it has been installed?'}
+                            />
+                        </div>
+                    </BaseSettingsBox>
+                    <FeatureLimitsBox/>
+                    <ServerServiceContainer
+                        egg={egg}
+                        setEgg={setEgg}
+                        nestId={0}
+                    />
+                </div>
+                <div css={tw`grid grid-cols-1 gap-y-6 col-span-2 md:col-span-1`}>
+                    <AdminBox icon={faNetworkWired} title={'Networking'} isLoading={isSubmitting}>
+                        <div css={tw`grid grid-cols-1 gap-4 lg:gap-6`}>
+                            <div>
+                                <Label htmlFor={'allocation.default'}>Primary Allocation</Label>
+                                <Select
+                                    id={'allocation.default'}
+                                    name={'allocation.default'}
+                                    disabled={node === null}
+                                    onChange={e => setFieldValue('allocation.default', Number(e.currentTarget.value))}
+                                >
+                                    {node === null ? <option value="">Select a node...</option> : <option value="">Select an allocation...</option>}
+                                    {allocations?.map(a => <option key={a.id} value={a.id.toString()}>{a.getDisplayText()}</option>)}
+                                </Select>
+                            </div>
+                            {/*<div>*/}
+                            {/*    /!* TODO: Multi-select *!/*/}
+                            {/*    <Label htmlFor={'allocation.additional'}>Additional Allocations</Label>*/}
+                            {/*    <Select id={'allocation.additional'} name={'allocation.additional'} disabled={node === null}>*/}
+                            {/*        {node === null ? <option value="">Select a node...</option> : <option value="">Select additional allocations...</option>}*/}
+                            {/*        {allocations?.map(a => <option key={a.id} value={a.id.toString()}>{a.getDisplayText()}</option>)}*/}
+                            {/*    </Select>*/}
+                            {/*</div>*/}
+                        </div>
+                    </AdminBox>
+                    <ServerResourceBox/>
+                    <ServerImageContainer/>
+                </div>
+
+                <AdminBox title={'Startup Command'} css={tw`relative w-full col-span-2`}>
+                    <SpinnerOverlay visible={isSubmitting}/>
+
+                    <Field
+                        id={'startup'}
+                        name={'startup'}
+                        label={'Startup Command'}
+                        type={'text'}
+                        description={'Edit your server\'s startup command here. The following variables are available by default: {{SERVER_MEMORY}}, {{SERVER_IP}}, and {{SERVER_PORT}}.'}
+                        placeholder={egg?.startup || ''}
+                    />
+                </AdminBox>
+
+                <div css={tw`col-span-2 grid grid-cols-1 md:grid-cols-2 gap-y-6 gap-x-8`}>
+                    {/* This ensures that no variables are rendered unless the environment has a value for the variable. */}
+                    {egg?.relationships.variables?.filter(v => Object.keys(environment).find(e => e === v.environmentVariable) !== undefined).map((v, i) => (
+                        <ServerVariableContainer
+                            key={i}
+                            variable={v}
+                        />
+                    ))}
+                </div>
+
+                <div css={tw`bg-neutral-700 rounded shadow-md px-4 py-3 col-span-2`}>
+                    <div css={tw`flex flex-row`}>
+                        <Button
+                            type="submit"
+                            size="small"
+                            css={tw`ml-auto`}
+                            disabled={isSubmitting || !isValid}
+                        >
+                            Create Server
+                        </Button>
+                    </div>
+                </div>
+            </div>
+        </Form>
+    );
+}
 
 export default () => {
+    const history = useHistory();
+
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+
+    const submit = (r: CreateServerRequest, { setSubmitting }: FormikHelpers<CreateServerRequest>) => {
+        clearFlashes('server:create');
+
+        createServer(r)
+            .then(s => history.push(`/admin/servers/${s.id}`))
+            .catch(error => clearAndAddHttpError({ key: 'server:create', error }))
+            .then(() => setSubmitting(false));
+    };
+
     return (
         <AdminContentBlock title={'New Server'}>
             <div css={tw`w-full flex flex-row items-center mb-8`}>
@@ -11,6 +162,48 @@ export default () => {
                     <p css={tw`text-base text-neutral-400 whitespace-nowrap overflow-ellipsis overflow-hidden`}>Add a new server to the panel.</p>
                 </div>
             </div>
+
+            <FlashMessageRender byKey={'server:create'} css={tw`mb-4`}/>
+
+            <Formik
+                onSubmit={submit}
+                initialValues={{
+                    externalId: '',
+                    name: '',
+                    description: '',
+                    ownerId: 0,
+                    nodeId: 0,
+                    limits: {
+                        memory: 1024,
+                        swap: 0,
+                        disk: 4096,
+                        io: 500,
+                        cpu: 0,
+                        threads: '',
+                        // This value is inverted to have the switch be on when the
+                        // OOM Killer is enabled, rather than when disabled.
+                        oomDisabled: false,
+                    },
+                    featureLimits: {
+                        allocations: 1,
+                        backups: 0,
+                        databases: 0,
+                    },
+                    allocation: {
+                        default: 0,
+                        additional: [] as number[],
+                    },
+                    startup: '',
+                    environment: [],
+                    eggId: 0,
+                    image: '',
+                    skipScripts: false,
+                    startOnCompletion: true,
+                } as CreateServerRequest}
+                validationSchema={object().shape({})}
+            >
+                <InternalForm/>
+            </Formik>
         </AdminContentBlock>
     );
 };
diff --git a/resources/scripts/components/admin/servers/NodeSelect.tsx b/resources/scripts/components/admin/servers/NodeSelect.tsx
new file mode 100644
index 000000000..3188eb921
--- /dev/null
+++ b/resources/scripts/components/admin/servers/NodeSelect.tsx
@@ -0,0 +1,44 @@
+import React, { useState } from 'react';
+import { useFormikContext } from 'formik';
+import SearchableSelect, { Option } from '@/components/elements/SearchableSelect';
+import { Node, searchNodes } from '@/api/admin/node';
+
+export default ({ node, setNode }: { node: Node | null, setNode: (_: Node | null) => void }) => {
+    const { setFieldValue } = useFormikContext();
+
+    const [ nodes, setNodes ] = useState<Node[] | null>(null);
+
+    const onSearch = async (query: string) => {
+        setNodes(await searchNodes({ filters: { name: query } }));
+    };
+
+    const onSelect = (node: Node | null) => {
+        setNode(node);
+        setFieldValue('nodeId', node?.id || null);
+    };
+
+    const getSelectedText = (node: Node | null): string => node?.name || '';
+
+    return (
+        <SearchableSelect
+            id={'nodeId'}
+            name={'nodeId'}
+            label={'Node'}
+            placeholder={'Select a node...'}
+            items={nodes}
+            selected={node}
+            setSelected={setNode}
+            setItems={setNodes}
+            onSearch={onSearch}
+            onSelect={onSelect}
+            getSelectedText={getSelectedText}
+            nullable
+        >
+            {nodes?.map(d => (
+                <Option key={d.id} selectId={'nodeId'} id={d.id} item={d} active={d.id === node?.id}>
+                    {d.name}
+                </Option>
+            ))}
+        </SearchableSelect>
+    );
+};
diff --git a/resources/scripts/components/admin/servers/OwnerSelect.tsx b/resources/scripts/components/admin/servers/OwnerSelect.tsx
index c29348c69..e97f3b0b2 100644
--- a/resources/scripts/components/admin/servers/OwnerSelect.tsx
+++ b/resources/scripts/components/admin/servers/OwnerSelect.tsx
@@ -1,34 +1,26 @@
 import React, { useState } from 'react';
 import { useFormikContext } from 'formik';
-import { User } from '@/api/admin/users/getUsers';
-import searchUsers from '@/api/admin/users/searchUsers';
 import SearchableSelect, { Option } from '@/components/elements/SearchableSelect';
+import { User, searchUserAccounts } from '@/api/admin/user';
 
-export default ({ selected }: { selected: User | null }) => {
-    const context = useFormikContext();
+export default ({ selected }: { selected?: User }) => {
+    const { setFieldValue } = useFormikContext();
 
-    const [ user, setUser ] = useState<User | null>(selected);
+    const [ user, setUser ] = useState<User | null>(selected || null);
     const [ users, setUsers ] = useState<User[] | null>(null);
 
-    const onSearch = (query: string): Promise<void> => {
-        return new Promise((resolve, reject) => {
-            searchUsers({ username: query, email: query })
-                .then((users) => {
-                    setUsers(users);
-                    return resolve();
-                })
-                .catch(reject);
-        });
+    const onSearch = async (query: string) => {
+        setUsers(
+            await searchUserAccounts({ filters: { username: query, email: query } })
+        );
     };
 
     const onSelect = (user: User | null) => {
         setUser(user);
-        context.setFieldValue('ownerId', user?.id || null);
+        setFieldValue('ownerId', user?.id || null);
     };
 
-    const getSelectedText = (user: User | null): string => {
-        return user?.email || '';
-    };
+    const getSelectedText = (user: User | null): string => user?.email || '';
 
     return (
         <SearchableSelect
diff --git a/resources/scripts/components/admin/servers/ServerDeleteButton.tsx b/resources/scripts/components/admin/servers/ServerDeleteButton.tsx
index 4cbd3295e..1d2d0db35 100644
--- a/resources/scripts/components/admin/servers/ServerDeleteButton.tsx
+++ b/resources/scripts/components/admin/servers/ServerDeleteButton.tsx
@@ -5,27 +5,29 @@ import tw from 'twin.macro';
 import Button from '@/components/elements/Button';
 import ConfirmationModal from '@/components/elements/ConfirmationModal';
 import deleteServer from '@/api/admin/servers/deleteServer';
+import { TrashIcon } from '@heroicons/react/outline';
+import { useServerFromRoute } from '@/api/admin/server';
+import { useHistory } from 'react-router-dom';
 
-interface Props {
-    serverId: number;
-    onDeleted: () => void;
-}
-
-export default ({ serverId, onDeleted }: Props) => {
+export default () => {
+    const history = useHistory();
     const [ visible, setVisible ] = useState(false);
     const [ loading, setLoading ] = useState(false);
+    const { data: server } = useServerFromRoute();
 
-    const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
+    const {
+        clearFlashes,
+        clearAndAddHttpError,
+    } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
 
     const onDelete = () => {
+        if (!server) return;
+
         setLoading(true);
         clearFlashes('server');
 
-        deleteServer(serverId)
-            .then(() => {
-                setLoading(false);
-                onDeleted();
-            })
+        deleteServer(server.id)
+            .then(() => history.push('/admin/servers'))
             .catch(error => {
                 console.error(error);
                 clearAndAddHttpError({ key: 'server', error });
@@ -35,6 +37,8 @@ export default ({ serverId, onDeleted }: Props) => {
             });
     };
 
+    if (!server) return null;
+
     return (
         <>
             <ConfirmationModal
@@ -47,11 +51,14 @@ export default ({ serverId, onDeleted }: Props) => {
             >
                 Are you sure you want to delete this server?
             </ConfirmationModal>
-
-            <Button type={'button'} size={'xsmall'} color={'red'} onClick={() => setVisible(true)}>
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" css={tw`h-5 w-5`}>
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
-                </svg>
+            <Button
+                type={'button'}
+                size={'small'}
+                color={'red'}
+                onClick={() => setVisible(true)}
+                css={tw`flex items-center justify-center`}
+            >
+                <TrashIcon css={tw`w-5 h-5 mr-2`}/> Delete Server
             </Button>
         </>
     );
diff --git a/resources/scripts/components/admin/servers/ServerManageContainer.tsx b/resources/scripts/components/admin/servers/ServerManageContainer.tsx
index 56c82b289..fba2f6d49 100644
--- a/resources/scripts/components/admin/servers/ServerManageContainer.tsx
+++ b/resources/scripts/components/admin/servers/ServerManageContainer.tsx
@@ -1,17 +1,13 @@
 import React from 'react';
 import AdminBox from '@/components/admin/AdminBox';
 import tw from 'twin.macro';
-import { Context } from '@/components/admin/servers/ServerRouter';
 import Button from '@/components/elements/Button';
+import { useServerFromRoute } from '@/api/admin/server';
 
-const ServerManageContainer = () => {
-    const server = Context.useStoreState(state => state.server);
+export default () => {
+    const { data: server } = useServerFromRoute();
 
-    if (server === undefined) {
-        return (
-            <></>
-        );
-    }
+    if (!server) return null;
 
     return (
         <div css={tw`grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-x-2 gap-y-2`}>
@@ -52,17 +48,3 @@ const ServerManageContainer = () => {
         </div>
     );
 };
-
-export default () => {
-    const server = Context.useStoreState(state => state.server);
-
-    if (server === undefined) {
-        return (
-            <></>
-        );
-    }
-
-    return (
-        <ServerManageContainer/>
-    );
-};
diff --git a/resources/scripts/components/admin/servers/ServerRouter.tsx b/resources/scripts/components/admin/servers/ServerRouter.tsx
index 3439b703c..b7ba294e6 100644
--- a/resources/scripts/components/admin/servers/ServerRouter.tsx
+++ b/resources/scripts/components/admin/servers/ServerRouter.tsx
@@ -1,119 +1,65 @@
 import ServerManageContainer from '@/components/admin/servers/ServerManageContainer';
 import ServerStartupContainer from '@/components/admin/servers/ServerStartupContainer';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { useLocation } from 'react-router';
 import tw from 'twin.macro';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
-import { action, Action, Actions, createContextStore, useStoreActions } from 'easy-peasy';
-import { Server } from '@/api/admin/servers/getServers';
-import getServer from '@/api/admin/servers/getServer';
 import AdminContentBlock from '@/components/admin/AdminContentBlock';
 import Spinner from '@/components/elements/Spinner';
 import FlashMessageRender from '@/components/FlashMessageRender';
-import { ApplicationStore } from '@/state';
 import { SubNavigation, SubNavigationLink } from '@/components/admin/SubNavigation';
 import ServerSettingsContainer from '@/components/admin/servers/ServerSettingsContainer';
+import useFlash from '@/plugins/useFlash';
+import { useServerFromRoute } from '@/api/admin/server';
+import { AdjustmentsIcon, CogIcon, DatabaseIcon, FolderIcon, ShieldExclamationIcon } from '@heroicons/react/outline';
 
-export const ServerIncludes = [ 'allocations', 'user', 'variables' ];
-
-interface ctx {
-    server: Server | undefined;
-    setServer: Action<ctx, Server | undefined>;
-}
-
-export const Context = createContextStore<ctx>({
-    server: undefined,
-
-    setServer: action((state, payload) => {
-        state.server = payload;
-    }),
-});
-
-const ServerRouter = () => {
+export default () => {
     const location = useLocation();
     const match = useRouteMatch<{ id?: string }>();
 
-    const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
-    const [ loading, setLoading ] = useState(true);
-
-    const server = Context.useStoreState(state => state.server);
-    const setServer = Context.useStoreActions(actions => actions.setServer);
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+    const { data: server, error, isValidating, mutate } = useServerFromRoute();
 
     useEffect(() => {
-        clearFlashes('server');
-
-        getServer(Number(match.params?.id), ServerIncludes)
-            .then(server => setServer(server))
-            .catch(error => {
-                console.error(error);
-                clearAndAddHttpError({ key: 'server', error });
-            })
-            .then(() => setLoading(false));
+        mutate();
     }, []);
 
-    if (loading || server === undefined) {
-        return (
-            <AdminContentBlock>
-                <FlashMessageRender byKey={'server'} css={tw`mb-4`}/>
+    useEffect(() => {
+        if (!error) clearFlashes('server');
+        if (error) clearAndAddHttpError({ key: 'server', error });
+    }, [ error ]);
 
-                <div css={tw`w-full flex flex-col items-center justify-center`} style={{ height: '24rem' }}>
-                    <Spinner size={'base'}/>
-                </div>
+    if (!server || (error && isValidating)) {
+        return (
+            <AdminContentBlock showFlashKey={'server'}>
+                <Spinner size={'large'} centered/>
             </AdminContentBlock>
         );
     }
 
     return (
         <AdminContentBlock title={'Server - ' + server.name}>
+            <FlashMessageRender byKey={'backups'} css={tw`mb-4`}/>
             <div css={tw`w-full flex flex-row items-center mb-4`}>
                 <div css={tw`flex flex-col flex-shrink`} style={{ minWidth: '0' }}>
                     <h2 css={tw`text-2xl text-neutral-50 font-header font-medium`}>{server.name}</h2>
                     <p css={tw`text-base text-neutral-400 whitespace-nowrap overflow-ellipsis overflow-hidden`}>{server.uuid}</p>
                 </div>
             </div>
-
             <FlashMessageRender byKey={'server'} css={tw`mb-4`}/>
-
             <SubNavigation>
-                <SubNavigationLink to={`${match.url}`} name={'Settings'}>
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                        <path clipRule="evenodd" fillRule="evenodd" d="M11.49 3.17c-.38-1.56-2.6-1.56-2.98 0a1.532 1.532 0 01-2.286.948c-1.372-.836-2.942.734-2.106 2.106.54.886.061 2.042-.947 2.287-1.561.379-1.561 2.6 0 2.978a1.532 1.532 0 01.947 2.287c-.836 1.372.734 2.942 2.106 2.106a1.532 1.532 0 012.287.947c.379 1.561 2.6 1.561 2.978 0a1.533 1.533 0 012.287-.947c1.372.836 2.942-.734 2.106-2.106a1.533 1.533 0 01.947-2.287c1.561-.379 1.561-2.6 0-2.978a1.532 1.532 0 01-.947-2.287c.836-1.372-.734-2.942-2.106-2.106a1.532 1.532 0 01-2.287-.947zM10 13a3 3 0 100-6 3 3 0 000 6z" />
-                    </svg>
-                </SubNavigationLink>
-
-                <SubNavigationLink to={`${match.url}/startup`} name={'Startup'}>
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                        <path d="M5 4a1 1 0 00-2 0v7.268a2 2 0 000 3.464V16a1 1 0 102 0v-1.268a2 2 0 000-3.464V4zM11 4a1 1 0 10-2 0v1.268a2 2 0 000 3.464V16a1 1 0 102 0V8.732a2 2 0 000-3.464V4zM16 3a1 1 0 011 1v7.268a2 2 0 010 3.464V16a1 1 0 11-2 0v-1.268a2 2 0 010-3.464V4a1 1 0 011-1z" />
-                    </svg>
-                </SubNavigationLink>
-
-                <SubNavigationLink to={`${match.url}/databases`} name={'Databases'}>
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                        <path clipRule="evenodd" fillRule="evenodd" d="M3 12v3c0 1.657 3.134 3 7 3s7-1.343 7-3v-3c0 1.657-3.134 3-7 3s-7-1.343-7-3z" />
-                        <path clipRule="evenodd" fillRule="evenodd" d="M3 7v3c0 1.657 3.134 3 7 3s7-1.343 7-3V7c0 1.657-3.134 3-7 3S3 8.657 3 7z" />
-                        <path clipRule="evenodd" fillRule="evenodd" d="M17 5c0 1.657-3.134 3-7 3S3 6.657 3 5s3.134-3 7-3 7 1.343 7 3z" />
-                    </svg>
-                </SubNavigationLink>
-
-                <SubNavigationLink to={`${match.url}/mounts`} name={'Mounts'}>
-                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                        <path d="M2 6a2 2 0 012-2h5l2 2h5a2 2 0 012 2v6a2 2 0 01-2 2H4a2 2 0 01-2-2V6z"/>
-                    </svg>
-                </SubNavigationLink>
-
-                <SubNavigationLink to={`${match.url}/manage`} name={'Manage'}>
-                    <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-                        <path fillRule="evenodd" d="M10 1.944A11.954 11.954 0 012.166 5C2.056 5.649 2 6.319 2 7c0 5.225 3.34 9.67 8 11.317C14.66 16.67 18 12.225 18 7c0-.682-.057-1.35-.166-2.001A11.954 11.954 0 0110 1.944zM11 14a1 1 0 11-2 0 1 1 0 012 0zm0-7a1 1 0 10-2 0v3a1 1 0 102 0V7z" clipRule="evenodd" />
-                    </svg>
-                </SubNavigationLink>
+                <SubNavigationLink to={`${match.url}`} name={'Settings'} icon={CogIcon}/>
+                <SubNavigationLink to={`${match.url}/startup`} name={'Startup'} icon={AdjustmentsIcon}/>
+                <SubNavigationLink to={`${match.url}/databases`} name={'Databases'} icon={DatabaseIcon}/>
+                <SubNavigationLink to={`${match.url}/mounts`} name={'Mounts'} icon={FolderIcon}/>
+                <SubNavigationLink to={`${match.url}/manage`} name={'Manage'} icon={ShieldExclamationIcon}/>
             </SubNavigation>
-
             <Switch location={location}>
                 <Route path={`${match.path}`} exact>
-                    <ServerSettingsContainer server={server}/>
+                    <ServerSettingsContainer/>
                 </Route>
                 <Route path={`${match.path}/startup`} exact>
-                    <ServerStartupContainer server={server}/>
+                    <ServerStartupContainer/>
                 </Route>
                 <Route path={`${match.path}/manage`} exact>
                     <ServerManageContainer/>
@@ -122,11 +68,3 @@ const ServerRouter = () => {
         </AdminContentBlock>
     );
 };
-
-export default () => {
-    return (
-        <Context.Provider>
-            <ServerRouter/>
-        </Context.Provider>
-    );
-};
diff --git a/resources/scripts/components/admin/servers/ServerSettingsContainer.tsx b/resources/scripts/components/admin/servers/ServerSettingsContainer.tsx
index d1c890c55..e46fe2473 100644
--- a/resources/scripts/components/admin/servers/ServerSettingsContainer.tsx
+++ b/resources/scripts/components/admin/servers/ServerSettingsContainer.tsx
@@ -1,239 +1,22 @@
-import getAllocations from '@/api/admin/nodes/getAllocations';
-import { Server } from '@/api/admin/servers/getServers';
+import { useServerFromRoute } from '@/api/admin/server';
 import ServerDeleteButton from '@/components/admin/servers/ServerDeleteButton';
-import Label from '@/components/elements/Label';
-import Select from '@/components/elements/Select';
-import SelectField, { AsyncSelectField, Option } from '@/components/elements/SelectField';
-import { faBalanceScale, faCogs, faConciergeBell, faNetworkWired } from '@fortawesome/free-solid-svg-icons';
 import React from 'react';
-import AdminBox from '@/components/admin/AdminBox';
-import { useHistory } from 'react-router-dom';
 import tw from 'twin.macro';
 import { object } from 'yup';
 import updateServer, { Values } from '@/api/admin/servers/updateServer';
-import Field from '@/components/elements/Field';
-import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
-import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
-import { Context, ServerIncludes } from '@/components/admin/servers/ServerRouter';
-import { ApplicationStore } from '@/state';
-import { Actions, useStoreActions } from 'easy-peasy';
-import OwnerSelect from '@/components/admin/servers/OwnerSelect';
+import { Form, Formik, FormikHelpers } from 'formik';
+import { useStoreActions } from 'easy-peasy';
 import Button from '@/components/elements/Button';
-import FormikSwitch from '@/components/elements/FormikSwitch';
+import BaseSettingsBox from '@/components/admin/servers/settings/BaseSettingsBox';
+import FeatureLimitsBox from '@/components/admin/servers/settings/FeatureLimitsBox';
+import NetworkingBox from '@/components/admin/servers/settings/NetworkingBox';
+import ServerResourceBox from '@/components/admin/servers/settings/ServerResourceBox';
 
-export function ServerSettingsContainer ({ server }: { server?: Server }) {
-    const { isSubmitting } = useFormikContext();
+export default () => {
+    const { data: server } = useServerFromRoute();
+    const { clearFlashes, clearAndAddHttpError } = useStoreActions(actions => actions.flashes);
 
-    return (
-        <AdminBox icon={faCogs} title={'Settings'} css={tw`relative w-full`}>
-            <SpinnerOverlay visible={isSubmitting}/>
-
-            <div css={tw`mb-6 md:w-full md:flex md:flex-row`}>
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:mr-4 md:mb-0`}>
-                    <Field
-                        id={'name'}
-                        name={'name'}
-                        label={'Server Name'}
-                        type={'text'}
-                    />
-                </div>
-
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:ml-4 md:mb-0`}>
-                    <Field
-                        id={'externalId'}
-                        name={'externalId'}
-                        label={'External Identifier'}
-                        type={'text'}
-                    />
-                </div>
-            </div>
-
-            <div css={tw`mb-6 md:w-full md:flex md:flex-row`}>
-                <div css={tw`mb-6 w-full md:w-1/2 md:flex md:flex-col md:pr-4 md:mb-0`}>
-                    <OwnerSelect selected={server?.relations.user || null}/>
-                </div>
-            </div>
-        </AdminBox>
-    );
-}
-
-export function ServerFeatureContainer () {
-    const { isSubmitting } = useFormikContext();
-
-    return (
-        <AdminBox icon={faConciergeBell} title={'Feature Limits'} css={tw`relative w-full`}>
-            <SpinnerOverlay visible={isSubmitting}/>
-
-            <div css={tw`grid grid-cols-1 md:grid-cols-3 gap-x-8 gap-y-6`}>
-                <Field
-                    id={'featureLimits.allocations'}
-                    name={'featureLimits.allocations'}
-                    label={'Allocation Limit'}
-                    type={'number'}
-                    description={'The total number of allocations a user is allowed to create for this server.'}
-                />
-
-                <Field
-                    id={'featureLimits.backups'}
-                    name={'featureLimits.backups'}
-                    label={'Backup Limit'}
-                    type={'number'}
-                    description={'The total number of backups that can be created for this server.'}
-                />
-
-                <Field
-                    id={'featureLimits.databases'}
-                    name={'featureLimits.databases'}
-                    label={'Database Limit'}
-                    type={'number'}
-                    description={'The total number of databases a user is allowed to create for this server.'}
-                />
-            </div>
-        </AdminBox>
-    );
-}
-
-export function ServerAllocationsContainer ({ server }: { server: Server }) {
-    const { isSubmitting } = useFormikContext();
-
-    const loadOptions = async (inputValue: string, callback: (options: Option[]) => void) => {
-        const allocations = await getAllocations(server.nodeId, { ip: inputValue, server_id: '0' });
-        callback(allocations.map(a => {
-            return { value: a.id.toString(), label: a.getDisplayText() };
-        }));
-    };
-
-    return (
-        <AdminBox icon={faNetworkWired} title={'Networking'} css={tw`relative w-full`}>
-            <SpinnerOverlay visible={isSubmitting}/>
-
-            <div css={tw`mb-6`}>
-                <Label>Primary Allocation</Label>
-                <Select
-                    id={'allocationId'}
-                    name={'allocationId'}
-                >
-                    {server.relations?.allocations?.map(a => (
-                        <option key={a.id} value={a.id}>{a.getDisplayText()}</option>
-                    ))}
-                </Select>
-            </div>
-
-            <AsyncSelectField
-                id={'addAllocations'}
-                name={'addAllocations'}
-                label={'Add Allocations'}
-                loadOptions={loadOptions}
-                isMulti
-                css={tw`mb-6`}
-            />
-
-            <SelectField
-                id={'removeAllocations'}
-                name={'removeAllocations'}
-                label={'Remove Allocations'}
-                options={server.relations?.allocations?.map(a => {
-                    return { value: a.id.toString(), label: a.getDisplayText() };
-                }) || []}
-                isMulti
-                isSearchable
-                css={tw`mb-2`}
-            />
-        </AdminBox>
-    );
-}
-
-export function ServerResourceContainer () {
-    const { isSubmitting } = useFormikContext();
-
-    return (
-        <AdminBox icon={faBalanceScale} title={'Resources'} css={tw`relative w-full`}>
-            <SpinnerOverlay visible={isSubmitting}/>
-
-            <div css={tw`mb-6 md:w-full md:flex md:flex-row`}>
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:mr-4 md:mb-0`}>
-                    <Field
-                        id={'limits.cpu'}
-                        name={'limits.cpu'}
-                        label={'CPU Limit'}
-                        type={'text'}
-                        description={'Each thread on the system is considered to be 100%. Setting this value to 0 will allow the server to use CPU time without restriction.'}
-                    />
-                </div>
-
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:ml-4 md:mb-0`}>
-                    <Field
-                        id={'limits.threads'}
-                        name={'limits.threads'}
-                        label={'CPU Pinning'}
-                        type={'text'}
-                        description={'Advanced: Enter the specific CPU cores that this server can run on, or leave blank to allow all cores. This can be a single number, and or a comma seperated list, and or a dashed range. Example: 0, 0-1,3, or 0,1,3,4.  It is recommended to leave this value blank and let the CPU handle balancing the load.'}
-                    />
-                </div>
-            </div>
-
-            <div css={tw`mb-6 md:w-full md:flex md:flex-row`}>
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:mr-4 md:mb-0`}>
-                    <Field
-                        id={'limits.memory'}
-                        name={'limits.memory'}
-                        label={'Memory Limit'}
-                        type={'number'}
-                        description={'The maximum amount of memory allowed for this container. Setting this to 0 will allow unlimited memory in a container.'}
-                    />
-                </div>
-
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:ml-4 md:mb-0`}>
-                    <Field
-                        id={'limits.swap'}
-                        name={'limits.swap'}
-                        label={'Swap Limit'}
-                        type={'number'}
-                    />
-                </div>
-            </div>
-
-            <div css={tw`mb-6 md:w-full md:flex md:flex-row`}>
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:mr-4 md:mb-0`}>
-                    <Field
-                        id={'limits.disk'}
-                        name={'limits.disk'}
-                        label={'Disk Limit'}
-                        type={'number'}
-                        description={'This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to 0 to allow unlimited disk usage.'}
-                    />
-                </div>
-
-                <div css={tw`mb-6 md:w-full md:flex md:flex-col md:ml-4 md:mb-0`}>
-                    <Field
-                        id={'limits.io'}
-                        name={'limits.io'}
-                        label={'Block IO Proportion'}
-                        type={'number'}
-                        description={'Advanced: The IO performance of this server relative to other running containers on the system. Value should be between 10 and 1000.'}
-                    />
-                </div>
-            </div>
-
-            <div css={tw`mb-2 md:w-full md:flex md:flex-row`}>
-                <div css={tw`bg-neutral-800 border border-neutral-900 shadow-inner p-4 rounded`}>
-                    <FormikSwitch
-                        name={'limits.oomDisabled'}
-                        label={'Out of Memory Killer'}
-                        description={'Enabling the Out of Memory Killer may cause server processes to exit unexpectedly.'}
-                    />
-                </div>
-            </div>
-        </AdminBox>
-    );
-}
-
-export default function ServerSettingsContainer2 ({ server }: { server: Server }) {
-    const history = useHistory();
-
-    const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
-
-    const setServer = Context.useStoreActions(actions => actions.setServer);
+    if (!server) return null;
 
     const submit = (values: Values, { setSubmitting, setFieldValue }: FormikHelpers<Values>) => {
         clearFlashes('server');
@@ -242,9 +25,9 @@ export default function ServerSettingsContainer2 ({ server }: { server: Server }
         // OOM Killer is enabled, rather than when disabled.
         values.limits.oomDisabled = !values.limits.oomDisabled;
 
-        updateServer(server.id, values, ServerIncludes)
-            .then(s => {
-                setServer({ ...server, ...s });
+        updateServer(server.id, values)
+            .then(() => {
+                // setServer({ ...server, ...s });
 
                 // TODO: Figure out how to properly clear react-selects for allocations.
                 setFieldValue('addAllocations', []);
@@ -263,8 +46,7 @@ export default function ServerSettingsContainer2 ({ server }: { server: Server }
             initialValues={{
                 externalId: server.externalId || '',
                 name: server.name,
-                ownerId: server.ownerId,
-
+                ownerId: server.userId,
                 limits: {
                     memory: server.limits.memory,
                     swap: server.limits.swap,
@@ -276,49 +58,36 @@ export default function ServerSettingsContainer2 ({ server }: { server: Server }
                     // OOM Killer is enabled, rather than when disabled.
                     oomDisabled: !server.limits.oomDisabled,
                 },
-
                 featureLimits: {
                     allocations: server.featureLimits.allocations,
                     backups: server.featureLimits.backups,
                     databases: server.featureLimits.databases,
                 },
-
                 allocationId: server.allocationId,
                 addAllocations: [] as number[],
                 removeAllocations: [] as number[],
             }}
-            validationSchema={object().shape({
-            })}
+            validationSchema={object().shape({})}
         >
             {({ isSubmitting, isValid }) => (
                 <Form>
                     <div css={tw`grid grid-cols-1 md:grid-cols-2 gap-y-6 gap-x-8 mb-16`}>
-                        <div css={tw`flex flex-col`}>
-                            <div css={tw`flex mb-6`}>
-                                <ServerSettingsContainer server={server}/>
-                            </div>
-
-                            <div css={tw`flex mb-6`}>
-                                <ServerFeatureContainer/>
-                            </div>
-
-                            <div css={tw`flex`}>
-                                <ServerAllocationsContainer server={server}/>
-                            </div>
+                        <div css={tw`grid grid-cols-1 gap-y-6`}>
+                            <BaseSettingsBox/>
+                            <FeatureLimitsBox/>
+                            <NetworkingBox/>
                         </div>
-
                         <div css={tw`flex flex-col`}>
-                            <div css={tw`flex mb-6`}>
-                                <ServerResourceContainer/>
-                            </div>
-
-                            <div css={tw`bg-neutral-700 rounded shadow-md py-2 px-6`}>
+                            <ServerResourceBox/>
+                            <div css={tw`bg-neutral-700 rounded shadow-md px-4 xl:px-5 py-4 mt-6`}>
                                 <div css={tw`flex flex-row`}>
-                                    <ServerDeleteButton
-                                        serverId={server?.id}
-                                        onDeleted={() => history.push('/admin/servers')}
-                                    />
-                                    <Button type="submit" size="small" css={tw`ml-auto`} disabled={isSubmitting || !isValid}>
+                                    <ServerDeleteButton/>
+                                    <Button
+                                        type="submit"
+                                        size="small"
+                                        css={tw`ml-auto`}
+                                        disabled={isSubmitting || !isValid}
+                                    >
                                         Save Changes
                                     </Button>
                                 </div>
@@ -329,4 +98,4 @@ export default function ServerSettingsContainer2 ({ server }: { server: Server }
             )}
         </Formik>
     );
-}
+};
diff --git a/resources/scripts/components/admin/servers/ServerStartupContainer.tsx b/resources/scripts/components/admin/servers/ServerStartupContainer.tsx
index d89230974..f7fae7beb 100644
--- a/resources/scripts/components/admin/servers/ServerStartupContainer.tsx
+++ b/resources/scripts/components/admin/servers/ServerStartupContainer.tsx
@@ -1,9 +1,7 @@
-import getEgg, { Egg, EggVariable } from '@/api/admin/eggs/getEgg';
-import { Server } from '@/api/admin/servers/getServers';
+import { Egg, EggVariable, getEgg } from '@/api/admin/egg';
 import updateServerStartup, { Values } from '@/api/admin/servers/updateServerStartup';
 import EggSelect from '@/components/admin/servers/EggSelect';
-import NestSelect from '@/components/admin/servers/NestSelect';
-import { Context, ServerIncludes } from '@/components/admin/servers/ServerRouter';
+import NestSelector from '@/components/admin/servers/NestSelector';
 import FormikSwitch from '@/components/elements/FormikSwitch';
 import React, { useEffect, useState } from 'react';
 import Button from '@/components/elements/Button';
@@ -12,11 +10,13 @@ import AdminBox from '@/components/admin/AdminBox';
 import tw from 'twin.macro';
 import Field from '@/components/elements/Field';
 import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
-import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
+import { Form, Formik, FormikHelpers, useField, useFormikContext } from 'formik';
 import { ApplicationStore } from '@/state';
 import { Actions, useStoreActions } from 'easy-peasy';
 import Label from '@/components/elements/Label';
 import { object } from 'yup';
+import { Server, useServerFromRoute } from '@/api/admin/server';
+import { InferModel } from '@/api/admin';
 
 function ServerStartupLineContainer ({ egg, server }: { egg: Egg | null; server: Server }) {
     const { isSubmitting, setFieldValue } = useFormikContext();
@@ -27,12 +27,14 @@ function ServerStartupLineContainer ({ egg, server }: { egg: Egg | null; server:
         }
 
         if (server.eggId === egg.id) {
-            setFieldValue('startup', server.container.startup);
+            setFieldValue('image', server.container.image);
+            setFieldValue('startup', server.container.startup || '');
             return;
         }
 
         // Whenever the egg is changed, set the server's startup command to the egg's default.
-        setFieldValue('startup', egg.startup);
+        setFieldValue('image', egg.dockerImages.length > 0 ? egg.dockerImages[0] : '');
+        setFieldValue('startup', '');
     }, [ egg ]);
 
     return (
@@ -46,6 +48,7 @@ function ServerStartupLineContainer ({ egg, server }: { egg: Egg | null; server:
                     label={'Startup Command'}
                     type={'text'}
                     description={'Edit your server\'s startup command here. The following variables are available by default: {{SERVER_MEMORY}}, {{SERVER_IP}}, and {{SERVER_PORT}}.'}
+                    placeholder={egg?.startup || ''}
                 />
             </div>
 
@@ -57,35 +60,27 @@ function ServerStartupLineContainer ({ egg, server }: { egg: Egg | null; server:
     );
 }
 
-function ServerServiceContainer ({ egg, setEgg, server }: { egg: Egg | null, setEgg: (value: Egg | null) => void, server: Server }) {
+export function ServerServiceContainer ({ egg, setEgg, nestId: _nestId }: { egg: Egg | null, setEgg: (value: Egg | null) => void, nestId: number }) {
     const { isSubmitting } = useFormikContext();
 
-    const [ nestId, setNestId ] = useState<number | null>(server.nestId);
+    const [ nestId, setNestId ] = useState<number>(_nestId);
 
     return (
-        <AdminBox title={'Service Configuration'} css={tw`relative w-full`}>
-            <SpinnerOverlay visible={isSubmitting}/>
-
+        <AdminBox title={'Service Configuration'} isLoading={isSubmitting} css={tw`w-full`}>
             <div css={tw`mb-6`}>
-                <NestSelect nestId={nestId} setNestId={setNestId}/>
+                <NestSelector selectedNestId={nestId} onNestSelect={setNestId}/>
             </div>
-
             <div css={tw`mb-6`}>
-                <EggSelect nestId={nestId} egg={egg} setEgg={setEgg}/>
+                <EggSelect nestId={nestId} selectedEggId={egg?.id} onEggSelect={setEgg}/>
             </div>
-
             <div css={tw`bg-neutral-800 border border-neutral-900 shadow-inner p-4 rounded`}>
-                <FormikSwitch
-                    name={'skipScript'}
-                    label={'Skip Egg Install Script'}
-                    description={'SoonTM'}
-                />
+                <FormikSwitch name={'skipScripts'} label={'Skip Egg Install Script'} description={'Soon™'}/>
             </div>
         </AdminBox>
     );
 }
 
-function ServerImageContainer () {
+export function ServerImageContainer () {
     const { isSubmitting } = useFormikContext();
 
     return (
@@ -106,14 +101,21 @@ function ServerImageContainer () {
     );
 }
 
-function ServerVariableContainer ({ variable, defaultValue }: { variable: EggVariable, defaultValue: string }) {
-    const key = 'environment.' + variable.envVariable;
+export function ServerVariableContainer ({ variable, value }: { variable: EggVariable, value?: string }) {
+    const key = 'environment.' + variable.environmentVariable;
 
-    const { isSubmitting, setFieldValue } = useFormikContext();
+    const [ , , { setValue, setTouched } ] = useField<string | undefined>(key);
+
+    const { isSubmitting } = useFormikContext();
 
     useEffect(() => {
-        setFieldValue(key, defaultValue);
-    }, [ variable, defaultValue ]);
+        if (value === undefined) {
+            return;
+        }
+
+        setValue(value);
+        setTouched(true);
+    }, [ value ]);
 
     return (
         <AdminBox css={tw`relative w-full`} title={<p css={tw`text-sm uppercase`}>{variable.name}</p>}>
@@ -131,7 +133,7 @@ function ServerVariableContainer ({ variable, defaultValue }: { variable: EggVar
 }
 
 function ServerStartupForm ({ egg, setEgg, server }: { egg: Egg | null, setEgg: (value: Egg | null) => void; server: Server }) {
-    const { isSubmitting, isValid } = useFormikContext();
+    const { isSubmitting, isValid, values: { environment } } = useFormikContext<Values>();
 
     return (
         <Form>
@@ -148,7 +150,7 @@ function ServerStartupForm ({ egg, setEgg, server }: { egg: Egg | null, setEgg:
                         <ServerServiceContainer
                             egg={egg}
                             setEgg={setEgg}
-                            server={server}
+                            nestId={server.nestId}
                         />
                     </div>
 
@@ -158,11 +160,12 @@ function ServerStartupForm ({ egg, setEgg, server }: { egg: Egg | null, setEgg:
                 </div>
 
                 <div css={tw`grid grid-cols-1 md:grid-cols-2 gap-y-6 gap-x-8`}>
-                    {egg?.relations.variables?.map((v, i) => (
+                    {/* This ensures that no variables are rendered unless the environment has a value for the variable. */}
+                    {egg?.relationships.variables?.filter(v => Object.keys(environment).find(e => e === v.environmentVariable) !== undefined).map((v, i) => (
                         <ServerVariableContainer
                             key={i}
                             variable={v}
-                            defaultValue={server.relations?.variables.find(v2 => v.eggId === v2.eggId && v.envVariable === v2.envVariable)?.serverValue || v.defaultValue}
+                            value={server.relationships.variables?.find(v2 => v.eggId === v2.eggId && v.environmentVariable === v2.environmentVariable)?.serverValue}
                         />
                     ))}
                 </div>
@@ -179,26 +182,28 @@ function ServerStartupForm ({ egg, setEgg, server }: { egg: Egg | null, setEgg:
     );
 }
 
-export default function ServerStartupContainer ({ server }: { server: Server }) {
+export default () => {
+    const { data: server } = useServerFromRoute();
     const { clearFlashes, clearAndAddHttpError } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
-
-    const [ egg, setEgg ] = useState<Egg | null>(null);
-
-    const setServer = Context.useStoreActions(actions => actions.setServer);
+    const [ egg, setEgg ] = useState<InferModel<typeof getEgg> | null>(null);
 
     useEffect(() => {
-        getEgg(server.eggId, [ 'variables' ])
+        if (!server) return;
+
+        getEgg(server.eggId)
             .then(egg => setEgg(egg))
             .catch(error => console.error(error));
-    }, []);
+    }, [ server?.eggId ]);
+
+    if (!server) return null;
 
     const submit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
         clearFlashes('server');
 
-        updateServerStartup(server.id, values, ServerIncludes)
-            .then(s => {
-                setServer({ ...server, ...s });
-            })
+        updateServerStartup(server.id, values)
+            // .then(s => {
+            //     mutate(data => { ...data, ...s });
+            // })
             .catch(error => {
                 console.error(error);
                 clearAndAddHttpError({ key: 'server', error });
@@ -210,21 +215,20 @@ export default function ServerStartupContainer ({ server }: { server: Server })
         <Formik
             onSubmit={submit}
             initialValues={{
-                startup: server.container.startup,
-                // Don't ask.
-                environment: Object.fromEntries(egg?.relations.variables?.map(v => [ v.envVariable, '' ]) || []),
+                startup: server.container.startup || '',
+                environment: [] as Record<string, any>,
                 image: server.container.image,
                 eggId: server.eggId,
                 skipScripts: false,
             }}
-            validationSchema={object().shape({
-            })}
+            validationSchema={object().shape({})}
         >
             <ServerStartupForm
                 egg={egg}
+                // @ts-ignore
                 setEgg={setEgg}
                 server={server}
             />
         </Formik>
     );
-}
+};
diff --git a/resources/scripts/components/admin/servers/settings/BaseSettingsBox.tsx b/resources/scripts/components/admin/servers/settings/BaseSettingsBox.tsx
new file mode 100644
index 000000000..f0060375b
--- /dev/null
+++ b/resources/scripts/components/admin/servers/settings/BaseSettingsBox.tsx
@@ -0,0 +1,24 @@
+import React, { ReactNode } from 'react';
+import tw from 'twin.macro';
+import { useFormikContext } from 'formik';
+import AdminBox from '@/components/admin/AdminBox';
+import { faCogs } from '@fortawesome/free-solid-svg-icons';
+import Field from '@/components/elements/Field';
+import OwnerSelect from '@/components/admin/servers/OwnerSelect';
+import { useServerFromRoute } from '@/api/admin/server';
+
+export default ({ children }: { children?: ReactNode }) => {
+    const { data: server } = useServerFromRoute();
+    const { isSubmitting } = useFormikContext();
+
+    return (
+        <AdminBox icon={faCogs} title={'Settings'} isLoading={isSubmitting}>
+            <div css={tw`grid grid-cols-1 xl:grid-cols-2 gap-4 lg:gap-6`}>
+                <Field id={'name'} name={'name'} label={'Server Name'} type={'text'} placeholder={'My Amazing Server'}/>
+                <Field id={'externalId'} name={'externalId'} label={'External Identifier'} type={'text'}/>
+                <OwnerSelect selected={server?.relationships.user}/>
+                {children}
+            </div>
+        </AdminBox>
+    );
+};
diff --git a/resources/scripts/components/admin/servers/settings/FeatureLimitsBox.tsx b/resources/scripts/components/admin/servers/settings/FeatureLimitsBox.tsx
new file mode 100644
index 000000000..ea312fb81
--- /dev/null
+++ b/resources/scripts/components/admin/servers/settings/FeatureLimitsBox.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { useFormikContext } from 'formik';
+import AdminBox from '@/components/admin/AdminBox';
+import { faConciergeBell } from '@fortawesome/free-solid-svg-icons';
+import tw from 'twin.macro';
+import Field from '@/components/elements/Field';
+
+export default () => {
+    const { isSubmitting } = useFormikContext();
+
+    return (
+        <AdminBox icon={faConciergeBell} title={'Feature Limits'} isLoading={isSubmitting}>
+            <div css={tw`grid grid-cols-1 xl:grid-cols-2 gap-4 lg:gap-6`}>
+                <Field
+                    id={'featureLimits.allocations'}
+                    name={'featureLimits.allocations'}
+                    label={'Allocation Limit'}
+                    type={'number'}
+                    description={'The total number of allocations a user is allowed to create for this server.'}
+                />
+                <Field
+                    id={'featureLimits.backups'}
+                    name={'featureLimits.backups'}
+                    label={'Backup Limit'}
+                    type={'number'}
+                    description={'The total number of backups that can be created for this server.'}
+                />
+                <Field
+                    id={'featureLimits.databases'}
+                    name={'featureLimits.databases'}
+                    label={'Database Limit'}
+                    type={'number'}
+                    description={'The total number of databases a user is allowed to create for this server.'}
+                />
+            </div>
+        </AdminBox>
+    );
+};
diff --git a/resources/scripts/components/admin/servers/settings/NetworkingBox.tsx b/resources/scripts/components/admin/servers/settings/NetworkingBox.tsx
new file mode 100644
index 000000000..a75a321a5
--- /dev/null
+++ b/resources/scripts/components/admin/servers/settings/NetworkingBox.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import { useFormikContext } from 'formik';
+import SelectField, { AsyncSelectField, Option } from '@/components/elements/SelectField';
+import getAllocations from '@/api/admin/nodes/getAllocations';
+import AdminBox from '@/components/admin/AdminBox';
+import { faNetworkWired } from '@fortawesome/free-solid-svg-icons';
+import tw from 'twin.macro';
+import Label from '@/components/elements/Label';
+import Select from '@/components/elements/Select';
+import { useServerFromRoute } from '@/api/admin/server';
+
+export default () => {
+    const { isSubmitting } = useFormikContext();
+    const { data: server } = useServerFromRoute();
+
+    const loadOptions = async (inputValue: string, callback: (options: Option[]) => void) => {
+        if (!server) {
+            // eslint-disable-next-line node/no-callback-literal
+            callback([] as Option[]);
+            return;
+        }
+
+        const allocations = await getAllocations(server.nodeId, { ip: inputValue, server_id: '0' });
+
+        callback(allocations.map(a => {
+            return { value: a.id.toString(), label: a.getDisplayText() };
+        }));
+    };
+
+    return (
+        <AdminBox icon={faNetworkWired} title={'Networking'} isLoading={isSubmitting}>
+            <div css={tw`grid grid-cols-1 gap-4 lg:gap-6`}>
+                <div>
+                    <Label htmlFor={'allocationId'}>Primary Allocation</Label>
+                    <Select id={'allocationId'} name={'allocationId'}>
+                        {server?.relationships.allocations?.map(a => (
+                            <option key={a.id} value={a.id}>{a.getDisplayText()}</option>
+                        ))}
+                    </Select>
+                </div>
+                <AsyncSelectField
+                    id={'addAllocations'}
+                    name={'addAllocations'}
+                    label={'Add Allocations'}
+                    loadOptions={loadOptions}
+                    isMulti
+                />
+                <SelectField
+                    id={'removeAllocations'}
+                    name={'removeAllocations'}
+                    label={'Remove Allocations'}
+                    options={server?.relationships.allocations?.map(a => {
+                        return { value: a.id.toString(), label: a.getDisplayText() };
+                    }) || []}
+                    isMulti
+                    isSearchable
+                />
+            </div>
+        </AdminBox>
+    );
+};
diff --git a/resources/scripts/components/admin/servers/settings/ServerResourceBox.tsx b/resources/scripts/components/admin/servers/settings/ServerResourceBox.tsx
new file mode 100644
index 000000000..c715c5939
--- /dev/null
+++ b/resources/scripts/components/admin/servers/settings/ServerResourceBox.tsx
@@ -0,0 +1,66 @@
+import { useFormikContext } from 'formik';
+import AdminBox from '@/components/admin/AdminBox';
+import { faBalanceScale } from '@fortawesome/free-solid-svg-icons';
+import tw from 'twin.macro';
+import Field from '@/components/elements/Field';
+import FormikSwitch from '@/components/elements/FormikSwitch';
+import React from 'react';
+
+export default () => {
+    const { isSubmitting } = useFormikContext();
+
+    return (
+        <AdminBox icon={faBalanceScale} title={'Resources'} isLoading={isSubmitting}>
+            <div css={tw`grid grid-cols-1 xl:grid-cols-2 gap-4 lg:gap-6`}>
+                <Field
+                    id={'limits.cpu'}
+                    name={'limits.cpu'}
+                    label={'CPU Limit'}
+                    type={'text'}
+                    description={'Each thread on the system is considered to be 100%. Setting this value to 0 will allow the server to use CPU time without restriction.'}
+                />
+                <Field
+                    id={'limits.threads'}
+                    name={'limits.threads'}
+                    label={'CPU Pinning'}
+                    type={'text'}
+                    description={'Advanced: Enter the specific CPU cores that this server can run on, or leave blank to allow all cores. This can be a single number, and or a comma seperated list, and or a dashed range. Example: 0, 0-1,3, or 0,1,3,4.  It is recommended to leave this value blank and let the CPU handle balancing the load.'}
+                />
+                <Field
+                    id={'limits.memory'}
+                    name={'limits.memory'}
+                    label={'Memory Limit'}
+                    type={'number'}
+                    description={'The maximum amount of memory allowed for this container. Setting this to 0 will allow unlimited memory in a container.'}
+                />
+                <Field
+                    id={'limits.swap'}
+                    name={'limits.swap'}
+                    label={'Swap Limit'}
+                    type={'number'}
+                />
+                <Field
+                    id={'limits.disk'}
+                    name={'limits.disk'}
+                    label={'Disk Limit'}
+                    type={'number'}
+                    description={'This server will not be allowed to boot if it is using more than this amount of space. If a server goes over this limit while running it will be safely stopped and locked until enough space is available. Set to 0 to allow unlimited disk usage.'}
+                />
+                <Field
+                    id={'limits.io'}
+                    name={'limits.io'}
+                    label={'Block IO Proportion'}
+                    type={'number'}
+                    description={'Advanced: The IO performance of this server relative to other running containers on the system. Value should be between 10 and 1000.'}
+                />
+                <div css={tw`xl:col-span-2 bg-neutral-800 border border-neutral-900 shadow-inner p-4 rounded`}>
+                    <FormikSwitch
+                        name={'limits.oomDisabled'}
+                        label={'Out of Memory Killer'}
+                        description={'Enabling the Out of Memory Killer may cause server processes to exit unexpectedly.'}
+                    />
+                </div>
+            </div>
+        </AdminBox>
+    );
+};
diff --git a/resources/scripts/components/admin/settings/GeneralSettings.tsx b/resources/scripts/components/admin/settings/GeneralSettings.tsx
new file mode 100644
index 000000000..41316152c
--- /dev/null
+++ b/resources/scripts/components/admin/settings/GeneralSettings.tsx
@@ -0,0 +1,46 @@
+import Field, { FieldRow } from '@/components/elements/Field';
+import { Form, Formik } from 'formik';
+import React from 'react';
+import AdminBox from '@/components/admin/AdminBox';
+import tw from 'twin.macro';
+
+export default () => {
+    const submit = () => {
+        //
+    };
+
+    return (
+        <Formik
+            onSubmit={submit}
+            initialValues={{}}
+        >
+            <Form>
+                <div css={tw`grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6`}>
+                    <AdminBox title="Branding">
+                        <FieldRow>
+                            <Field
+                                id={'appName'}
+                                name={'appName'}
+                                type={'text'}
+                                label={'App Name'}
+                                description={''}
+                            />
+                        </FieldRow>
+                    </AdminBox>
+
+                    <AdminBox title="Analytics">
+                        <FieldRow>
+                            <Field
+                                id={'googleAnalytics'}
+                                name={'googleAnalytics'}
+                                type={'text'}
+                                label={'Google Analytics'}
+                                description={''}
+                            />
+                        </FieldRow>
+                    </AdminBox>
+                </div>
+            </Form>
+        </Formik>
+    );
+};
diff --git a/resources/scripts/components/admin/settings/MailSettings.tsx b/resources/scripts/components/admin/settings/MailSettings.tsx
new file mode 100644
index 000000000..e79d18cf8
--- /dev/null
+++ b/resources/scripts/components/admin/settings/MailSettings.tsx
@@ -0,0 +1,111 @@
+import Button from '@/components/elements/Button';
+import Label from '@/components/elements/Label';
+import { Form, Formik } from 'formik';
+import React from 'react';
+import tw from 'twin.macro';
+import AdminBox from '@/components/admin/AdminBox';
+import Field, { FieldRow } from '@/components/elements/Field';
+import Select from '@/components/elements/Select';
+
+export default () => {
+    const submit = () => {
+        //
+    };
+
+    return (
+        <Formik
+            onSubmit={submit}
+            initialValues={{
+                smtpHost: 'smtp.example.com',
+                smtpPort: 587,
+                smtpEncryption: 'tls',
+                username: '',
+                password: '',
+                mailFrom: 'no-reply@example.com',
+                mailFromName: 'Pterodactyl Panel',
+            }}
+        >
+            {({ isSubmitting, isValid }) => (
+                <Form>
+                    <AdminBox title="Mail">
+                        <FieldRow css={tw`lg:grid-cols-3`}>
+                            <Field
+                                id={'smtpHost'}
+                                name={'smtpHost'}
+                                type={'text'}
+                                label={'SMTP Host'}
+                                description={''}
+                            />
+                            <Field
+                                id={'smtpPort'}
+                                name={'smtpPort'}
+                                type={'number'}
+                                label={'SMTP Port'}
+                                description={''}
+                            />
+                            <div>
+                                <Label>Encryption</Label>
+                                <Select
+                                    id={'smtpEncryption'}
+                                    name={'smtpEncryption'}
+                                    defaultValue={'tls'}
+                                >
+                                    <option value="">None</option>
+                                    <option value="ssl">Secure Sockets Layer (SSL)</option>
+                                    <option value="tls">Transport Layer Security (TLS)</option>
+                                </Select>
+                            </div>
+                        </FieldRow>
+
+                        <FieldRow>
+                            <Field
+                                id={'username'}
+                                name={'username'}
+                                type={'text'}
+                                label={'Username'}
+                                description={''}
+                            />
+                            <Field
+                                id={'password'}
+                                name={'password'}
+                                type={'password'}
+                                label={'Password'}
+                                description={''}
+                            />
+                        </FieldRow>
+
+                        <FieldRow>
+                            <Field
+                                id={'mailFrom'}
+                                name={'mailFrom'}
+                                type={'text'}
+                                label={'Mail From'}
+                                description={''}
+                            />
+                            <Field
+                                id={'mailFromName'}
+                                name={'mailFromName'}
+                                type={'text'}
+                                label={'Mail From Name'}
+                                description={''}
+                            />
+                        </FieldRow>
+                    </AdminBox>
+
+                    <div css={tw`bg-neutral-700 rounded shadow-md px-4 xl:px-5 py-4 mt-6`}>
+                        <div css={tw`flex flex-row`}>
+                            <Button
+                                type="submit"
+                                size="small"
+                                css={tw`ml-auto`}
+                                disabled={isSubmitting || !isValid}
+                            >
+                                Save Changes
+                            </Button>
+                        </div>
+                    </div>
+                </Form>
+            )}
+        </Formik>
+    );
+};
diff --git a/resources/scripts/components/admin/settings/SettingsContainer.tsx b/resources/scripts/components/admin/settings/SettingsContainer.tsx
index 3e2fc2066..29f4c07bb 100644
--- a/resources/scripts/components/admin/settings/SettingsContainer.tsx
+++ b/resources/scripts/components/admin/settings/SettingsContainer.tsx
@@ -1,8 +1,17 @@
+import MailSettings from '@/components/admin/settings/MailSettings';
+import { AdjustmentsIcon, ChipIcon, CodeIcon, MailIcon, ShieldCheckIcon } from '@heroicons/react/outline';
 import React from 'react';
+import { Route, useLocation } from 'react-router';
+import { Switch } from 'react-router-dom';
 import tw from 'twin.macro';
+import FlashMessageRender from '@/components/FlashMessageRender';
 import AdminContentBlock from '@/components/admin/AdminContentBlock';
+import { SubNavigation, SubNavigationLink } from '@/components/admin/SubNavigation';
+import GeneralSettings from '@/components/admin/settings/GeneralSettings';
 
 export default () => {
+    const location = useLocation();
+
     return (
         <AdminContentBlock title={'Settings'}>
             <div css={tw`w-full flex flex-row items-center mb-8`}>
@@ -11,6 +20,44 @@ export default () => {
                     <p css={tw`text-base text-neutral-400 whitespace-nowrap overflow-ellipsis overflow-hidden`}>Configure and manage settings for Pterodactyl.</p>
                 </div>
             </div>
+
+            <FlashMessageRender byKey={'admin:settings'} css={tw`mb-4`}/>
+
+            <SubNavigation>
+                <SubNavigationLink to="/admin/settings" name="General">
+                    <ChipIcon/>
+                </SubNavigationLink>
+                <SubNavigationLink to="/admin/settings/mail" name="Mail">
+                    <MailIcon/>
+                </SubNavigationLink>
+                <SubNavigationLink to="/admin/settings/security" name="Security">
+                    <ShieldCheckIcon/>
+                </SubNavigationLink>
+                <SubNavigationLink to="/admin/settings/features" name="Features">
+                    <AdjustmentsIcon/>
+                </SubNavigationLink>
+                <SubNavigationLink to="/admin/settings/advanced" name="Advanced">
+                    <CodeIcon/>
+                </SubNavigationLink>
+            </SubNavigation>
+
+            <Switch location={location}>
+                <Route path="/admin/settings" exact>
+                    <GeneralSettings/>
+                </Route>
+                <Route path="/admin/settings/mail" exact>
+                    <MailSettings/>
+                </Route>
+                <Route path="/admin/settings/security" exact>
+                    <p>Security</p>
+                </Route>
+                <Route path="/admin/settings/features" exact>
+                    <p>Features</p>
+                </Route>
+                <Route path="/admin/settings/advanced" exact>
+                    <p>Advanced</p>
+                </Route>
+            </Switch>
         </AdminContentBlock>
     );
 };
diff --git a/resources/scripts/components/admin/users/UserAboutContainer.tsx b/resources/scripts/components/admin/users/UserAboutContainer.tsx
index 0449c9d46..ac186f4da 100644
--- a/resources/scripts/components/admin/users/UserAboutContainer.tsx
+++ b/resources/scripts/components/admin/users/UserAboutContainer.tsx
@@ -39,6 +39,7 @@ const UserAboutContainer = () => {
         <UserForm
             title={'Edit User'}
             initialValues={{
+                externalId: user.externalId,
                 username: user.username,
                 email: user.email,
                 adminRoleId: user.adminRoleId,
@@ -46,7 +47,8 @@ const UserAboutContainer = () => {
                 rootAdmin: user.rootAdmin,
             }}
             onSubmit={submit}
-            role={user?.relationships.role || null}
+            uuid={user.uuid}
+            role={user.relationships.role || null}
         >
             <div css={tw`flex`}>
                 <UserDeleteButton
diff --git a/resources/scripts/components/admin/users/UserForm.tsx b/resources/scripts/components/admin/users/UserForm.tsx
index 72894d511..2a340d7df 100644
--- a/resources/scripts/components/admin/users/UserForm.tsx
+++ b/resources/scripts/components/admin/users/UserForm.tsx
@@ -1,4 +1,7 @@
+import CopyOnClick from '@/components/elements/CopyOnClick';
 import FormikSwitch from '@/components/elements/FormikSwitch';
+import Input from '@/components/elements/Input';
+import Label from '@/components/elements/Label';
 import React from 'react';
 import tw from 'twin.macro';
 import { action, Action, createContextStore } from 'easy-peasy';
@@ -10,7 +13,7 @@ import { bool, object, string } from 'yup';
 import { Role } from '@/api/admin/roles/getRoles';
 import { Values } from '@/api/admin/users/updateUser';
 import Button from '@/components/elements/Button';
-import Field from '@/components/elements/Field';
+import Field, { FieldRow } from '@/components/elements/Field';
 import RoleSelect from '@/components/admin/users/RoleSelect';
 
 interface ctx {
@@ -33,16 +36,18 @@ export interface Params {
 
     onSubmit: (values: Values, helpers: FormikHelpers<Values>) => void;
 
+    uuid?: string;
     role: Role | null;
 }
 
-export default function UserForm ({ title, initialValues, children, onSubmit, role }: Params) {
+export default function UserForm ({ title, initialValues, children, onSubmit, uuid, role }: Params) {
     const submit = (values: Values, helpers: FormikHelpers<Values>) => {
         onSubmit(values, helpers);
     };
 
     if (!initialValues) {
         initialValues = {
+            externalId: '',
             username: '',
             email: '',
             password: '',
@@ -68,45 +73,56 @@ export default function UserForm ({ title, initialValues, children, onSubmit, ro
                             <SpinnerOverlay visible={isSubmitting}/>
 
                             <Form css={tw`mb-0`}>
-                                <div css={tw`md:w-full md:flex md:flex-row`}>
-                                    <div css={tw`md:w-full md:flex md:flex-col md:mr-4 mt-6 md:mt-0`}>
-                                        <Field
-                                            id={'username'}
-                                            name={'username'}
-                                            label={'Username'}
-                                            type={'text'}
-                                        />
-                                    </div>
-
-                                    <div css={tw`md:w-full md:flex md:flex-col md:ml-4 mt-6 md:mt-0`}>
-                                        <Field
-                                            id={'email'}
-                                            name={'email'}
-                                            label={'Email Address'}
-                                            type={'email'}
-                                        />
-                                    </div>
-                                </div>
-
-                                <div css={tw`md:w-full md:flex md:flex-row mt-6`}>
-                                    <div css={tw`md:w-full md:flex md:flex-col md:mr-4 mt-6 md:mt-0`}>
-                                        <Field
-                                            id={'password'}
-                                            name={'password'}
-                                            label={'Password'}
-                                            type={'password'}
-                                            placeholder={'••••••••'}
-                                            autoComplete={'new-password'}
-                                        />
-                                    </div>
-
-                                    <div css={tw`md:w-full md:flex md:flex-col md:ml-4 mt-6 md:mt-0`}>
-                                        <RoleSelect selected={role}/>
-                                    </div>
-                                </div>
+                                <FieldRow>
+                                    {uuid &&
+                                        <div>
+                                            <Label>UUID</Label>
+                                            <CopyOnClick text={uuid}>
+                                                <Input
+                                                    type={'text'}
+                                                    value={uuid}
+                                                    readOnly
+                                                />
+                                            </CopyOnClick>
+                                        </div>
+                                    }
+                                    <Field
+                                        id={'externalId'}
+                                        name={'externalId'}
+                                        label={'External ID'}
+                                        type={'text'}
+                                        description={'Used by external integrations, this field should not be modified unless you know what you are doing.'}
+                                    />
+                                    <Field
+                                        id={'username'}
+                                        name={'username'}
+                                        label={'Username'}
+                                        type={'text'}
+                                        description={'The user\'s username, what else would go here?'}
+                                    />
+                                    <Field
+                                        id={'email'}
+                                        name={'email'}
+                                        label={'Email Address'}
+                                        type={'email'}
+                                        description={'The user\'s email address, what else would go here?'}
+                                    />
+                                    <Field
+                                        id={'password'}
+                                        name={'password'}
+                                        label={'Password'}
+                                        type={'password'}
+                                        placeholder={'••••••••'}
+                                        autoComplete={'new-password'}
+                                        /* TODO: Change description depending on if user is being created or updated. */
+                                        description={'Leave empty to email the user a link where they will be required to set a password.'}
+                                    />
+                                    <RoleSelect selected={role}/>
+                                </FieldRow>
 
+                                {/* TODO: Remove toggle once role permissions are implemented. */}
                                 <div css={tw`w-full flex flex-row mb-6`}>
-                                    <div css={tw`w-full bg-neutral-800 border border-neutral-900 shadow-inner mt-6 p-4 rounded`}>
+                                    <div css={tw`w-full bg-neutral-800 border border-neutral-900 shadow-inner p-4 rounded`}>
                                         <FormikSwitch
                                             name={'rootAdmin'}
                                             label={'Root Admin'}
@@ -119,7 +135,7 @@ export default function UserForm ({ title, initialValues, children, onSubmit, ro
                                     {children}
                                     <div css={tw`flex ml-auto`}>
                                         <Button type={'submit'} disabled={isSubmitting || !isValid}>
-                                            Save
+                                            Save Changes
                                         </Button>
                                     </div>
                                 </div>
diff --git a/resources/scripts/components/dashboard/AccountOverviewContainer.tsx b/resources/scripts/components/dashboard/AccountOverviewContainer.tsx
index 5f6653f71..f6d23cc8b 100644
--- a/resources/scripts/components/dashboard/AccountOverviewContainer.tsx
+++ b/resources/scripts/components/dashboard/AccountOverviewContainer.tsx
@@ -10,19 +10,19 @@ import { breakpoint } from '@/theme';
 import MessageBox from '@/components/MessageBox';
 
 const Container = styled.div`
-    ${tw`flex flex-wrap`};
+  ${tw`flex flex-wrap`};
 
-    & > div {
-        ${tw`w-full`};
+  & > div {
+    ${tw`w-full`};
 
-        ${breakpoint('md')`
-            width: calc(50% - 1rem);
-        `}
+    ${breakpoint('sm')`
+      width: calc(50% - 1rem);
+    `}
 
-        ${breakpoint('xl')`
-            ${tw`w-auto flex-1`};
-        `}
-    }
+    ${breakpoint('md')`
+      ${tw`w-auto flex-1`};
+    `}
+  }
 `;
 
 export default () => {
@@ -35,21 +35,23 @@ export default () => {
                 Your account must have two-factor authentication enabled in order to continue.
             </MessageBox>
             }
-            <Container css={[ tw`mb-10`, state?.twoFactorRedirect ? tw`mt-4` : tw`mt-10` ]}>
+
+            <Container css={[ tw`lg:grid lg:grid-cols-3 mb-10`, state?.twoFactorRedirect ? tw`mt-4` : tw`mt-10` ]}>
                 <ContentBox title={'Update Password'} showFlashes={'account:password'}>
                     <UpdatePasswordForm/>
                 </ContentBox>
                 <ContentBox
-                    css={tw`mt-8 md:mt-0 md:ml-8`}
+                    css={tw`mt-8 sm:mt-0 sm:ml-8`}
                     title={'Update Email Address'}
                     showFlashes={'account:email'}
                 >
                     <UpdateEmailAddressForm/>
                 </ContentBox>
-                <ContentBox css={tw`xl:ml-8 mt-8 xl:mt-0`} title={'Configure Two Factor'}>
+                <ContentBox css={tw`md:ml-8 mt-8 md:mt-0`} title={'Configure Two Factor'}>
                     <ConfigureTwoFactorForm/>
                 </ContentBox>
             </Container>
+
         </PageContentBlock>
     );
 };
diff --git a/resources/scripts/components/dashboard/ServerRow.tsx b/resources/scripts/components/dashboard/ServerRow.tsx
index ab8c4562e..60922df06 100644
--- a/resources/scripts/components/dashboard/ServerRow.tsx
+++ b/resources/scripts/components/dashboard/ServerRow.tsx
@@ -4,7 +4,7 @@ import { faEthernet, faHdd, faMemory, faMicrochip, faServer } from '@fortawesome
 import { Link } from 'react-router-dom';
 import { Server } from '@/api/server/getServer';
 import getServerResourceUsage, { ServerPowerState, ServerStats } from '@/api/server/getServerResourceUsage';
-import { bytesToHuman, megabytesToHuman } from '@/helpers';
+import { bytesToHuman, megabytesToHuman, formatIp } from '@/helpers';
 import tw, { styled } from 'twin.macro';
 import GreyRowBox from '@/components/elements/GreyRowBox';
 import Spinner from '@/components/elements/Spinner';
@@ -96,7 +96,7 @@ export default ({ server, className }: { server: Server; className?: string }) =
                     {
                         server.allocations.filter(alloc => alloc.isDefault).map(allocation => (
                             <React.Fragment key={allocation.ip + allocation.port.toString()}>
-                                {allocation.alias || allocation.ip}:{allocation.port}
+                                {allocation.alias || formatIp(allocation.ip)}:{allocation.port}
                             </React.Fragment>
                         ))
                     }
diff --git a/resources/scripts/components/dashboard/forms/DisableTwoFactorModal.tsx b/resources/scripts/components/dashboard/forms/DisableTwoFactorModal.tsx
index 854d0837a..60659fc3d 100644
--- a/resources/scripts/components/dashboard/forms/DisableTwoFactorModal.tsx
+++ b/resources/scripts/components/dashboard/forms/DisableTwoFactorModal.tsx
@@ -30,7 +30,7 @@ const DisableTwoFactorModal = () => {
             .catch(error => {
                 console.error(error);
 
-                clearAndAddHttpError({ error, key: 'account:two-factor' });
+                clearAndAddHttpError({ key: 'account:two-factor', error });
                 setSubmitting(false);
                 setPropOverrides(null);
             });
diff --git a/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx b/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx
index aea603995..87f10d438 100644
--- a/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx
+++ b/resources/scripts/components/dashboard/forms/SetupTwoFactorModal.tsx
@@ -31,7 +31,7 @@ const SetupTwoFactorModal = () => {
             .then(setToken)
             .catch(error => {
                 console.error(error);
-                clearAndAddHttpError({ error, key: 'account:two-factor' });
+                clearAndAddHttpError({ key: 'account:two-factor', error });
             });
     }, []);
 
@@ -44,7 +44,7 @@ const SetupTwoFactorModal = () => {
             .catch(error => {
                 console.error(error);
 
-                clearAndAddHttpError({ error, key: 'account:two-factor' });
+                clearAndAddHttpError({ key: 'account:two-factor', error });
             })
             .then(() => {
                 setSubmitting(false);
diff --git a/resources/scripts/components/dashboard/search/SearchModal.tsx b/resources/scripts/components/dashboard/search/SearchModal.tsx
index 598001af3..c7ce58008 100644
--- a/resources/scripts/components/dashboard/search/SearchModal.tsx
+++ b/resources/scripts/components/dashboard/search/SearchModal.tsx
@@ -12,7 +12,7 @@ import { ApplicationStore } from '@/state';
 import { Link } from 'react-router-dom';
 import tw, { styled } from 'twin.macro';
 import Input from '@/components/elements/Input';
-
+import { formatIp } from '@/helpers';
 type Props = RequiredModalProps;
 
 interface Values {
@@ -108,7 +108,7 @@ export default ({ ...props }: Props) => {
                                         <p css={tw`mt-1 text-xs text-neutral-400`}>
                                             {
                                                 server.allocations.filter(alloc => alloc.isDefault).map(allocation => (
-                                                    <span key={allocation.ip + allocation.port.toString()}>{allocation.alias || allocation.ip}:{allocation.port}</span>
+                                                    <span key={allocation.ip + allocation.port.toString()}>{allocation.alias || formatIp(allocation.ip)}:{allocation.port}</span>
                                                 ))
                                             }
                                         </p>
diff --git a/resources/scripts/components/elements/Button.tsx b/resources/scripts/components/elements/Button.tsx
index 3b0b820df..e4804c8a8 100644
--- a/resources/scripts/components/elements/Button.tsx
+++ b/resources/scripts/components/elements/Button.tsx
@@ -4,18 +4,14 @@ import Spinner from '@/components/elements/Spinner';
 
 interface Props {
     isLoading?: boolean;
-    size?: 'xsmall' | 'small' | 'large' | 'xlarge';
+    size?: 'inline' | 'xsmall' | 'small' | 'large' | 'xlarge';
     color?: 'green' | 'red' | 'primary' | 'grey';
     isSecondary?: boolean;
 }
 
-const ButtonStyle = styled.button<Omit<Props, 'isLoading'>>`
+const ButtonStyle = styled.button<Props>`
     ${tw`relative inline-block rounded p-2 tracking-wide text-sm transition-all duration-150 border`};
-
-    & > span {
-        ${tw`select-none`};
-    }
-
+  
     ${props => ((!props.isSecondary && !props.color) || props.color === 'primary') && css<Props>`
         ${props => !props.isSecondary && tw`bg-primary-500 border-primary-600 border text-primary-50`};
 
@@ -60,6 +56,7 @@ const ButtonStyle = styled.button<Omit<Props, 'isLoading'>>`
         `};
     `};
 
+    ${props => props.size === 'inline' && tw`p-1 text-xs`};
     ${props => props.size === 'xsmall' && tw`p-2 text-xs`};
     ${props => (!props.size || props.size === 'small') && tw`p-3`};
     ${props => props.size === 'large' && tw`p-4 text-sm`};
@@ -75,22 +72,24 @@ const ButtonStyle = styled.button<Omit<Props, 'isLoading'>>`
             ${props => props.color === 'green' && tw`bg-green-500 border-green-600 text-green-50`};
         }
     `};
+  
+    ${props => props.isLoading && tw`text-transparent`};
 
-    &:disabled { opacity: 0.55; cursor: default }
+    &:disabled {
+      ${tw`opacity-75 cursor-not-allowed`};
+    }
 `;
 
 type ComponentProps = Omit<JSX.IntrinsicElements['button'], 'ref' | keyof Props> & Props;
 
-const Button: React.FC<ComponentProps> = ({ children, isLoading, ...props }) => (
-    <ButtonStyle {...props}>
+const Button: React.FC<ComponentProps> = ({ children, isLoading, disabled, ...props }) => (
+    <ButtonStyle {...props} isLoading={isLoading} disabled={isLoading || disabled}>
         {isLoading &&
         <div css={tw`flex absolute justify-center items-center w-full h-full left-0 top-0`}>
             <Spinner size={'small'}/>
         </div>
         }
-        <span css={isLoading ? tw`text-transparent` : undefined}>
-            {children}
-        </span>
+        {children}
     </ButtonStyle>
 );
 
diff --git a/resources/scripts/components/elements/Checkbox.tsx b/resources/scripts/components/elements/Checkbox.tsx
index 790536489..25c9da037 100644
--- a/resources/scripts/components/elements/Checkbox.tsx
+++ b/resources/scripts/components/elements/Checkbox.tsx
@@ -1,45 +1,23 @@
+import { Field } from 'formik';
 import React from 'react';
-import { Field, FieldProps } from 'formik';
-import Input from '@/components/elements/Input';
+import tw from 'twin.macro';
+import Label from '@/components/elements/Label';
 
 interface Props {
+    id: string;
     name: string;
-    value: string;
+    label?: string;
     className?: string;
 }
 
-type OmitFields = 'ref' | 'name' | 'value' | 'type' | 'checked' | 'onClick' | 'onChange';
-
-type InputProps = Omit<JSX.IntrinsicElements['input'], OmitFields>;
-
-const Checkbox = ({ name, value, className, ...props }: Props & InputProps) => (
-    <Field name={name}>
-        {({ field, form }: FieldProps) => {
-            if (!Array.isArray(field.value)) {
-                console.error('Attempting to mount a checkbox using a field value that is not an array.');
-
-                return null;
-            }
-
-            return (
-                <Input
-                    {...field}
-                    {...props}
-                    className={className}
-                    type={'checkbox'}
-                    checked={(field.value || []).includes(value)}
-                    onClick={() => form.setFieldTouched(field.name, true)}
-                    onChange={e => {
-                        const set = new Set(field.value);
-                        set.has(value) ? set.delete(value) : set.add(value);
-
-                        field.onChange(e);
-                        form.setFieldValue(field.name, Array.from(set));
-                    }}
-                />
-            );
-        }}
-    </Field>
+const Checkbox = ({ id, name, label, className }: Props) => (
+    <div css={tw`flex flex-row`} className={className}>
+        <Field type={'checkbox'} id={id} name={name} css={[ label && tw`mr-2` ]}/>
+        {label &&
+        <div css={tw`flex-1`}>
+            <Label noBottomSpacing>{label}</Label>
+        </div>}
+    </div>
 );
 
 export default Checkbox;
diff --git a/resources/scripts/components/elements/Editor.tsx b/resources/scripts/components/elements/Editor.tsx
index 5fa2dfe81..c3a77b9c6 100644
--- a/resources/scripts/components/elements/Editor.tsx
+++ b/resources/scripts/components/elements/Editor.tsx
@@ -15,25 +15,25 @@ import { Compartment, Extension, EditorState } from '@codemirror/state';
 import { StreamLanguage, StreamParser } from '@codemirror/stream-parser';
 import { keymap, highlightSpecialChars, drawSelection, highlightActiveLine, EditorView } from '@codemirror/view';
 import { clike } from '@codemirror/legacy-modes/mode/clike';
-import { cppLanguage } from '@codemirror/lang-cpp';
-import { cssLanguage } from '@codemirror/lang-css';
+import { cpp } from '@codemirror/lang-cpp';
+import { css } from '@codemirror/lang-css';
 import { Cassandra, MariaSQL, MSSQL, MySQL, PostgreSQL, sql, SQLite, StandardSQL } from '@codemirror/lang-sql';
 import { diff } from '@codemirror/legacy-modes/mode/diff';
 import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile';
 import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
 import { go } from '@codemirror/legacy-modes/mode/go';
-import { htmlLanguage } from '@codemirror/lang-html';
+import { html } from '@codemirror/lang-html';
 import { http } from '@codemirror/legacy-modes/mode/http';
-import { javascriptLanguage, typescriptLanguage } from '@codemirror/lang-javascript';
-import { jsonLanguage } from '@codemirror/lang-json';
+import { javascript, typescriptLanguage } from '@codemirror/lang-javascript';
+import { json } from '@codemirror/lang-json';
 import { lua } from '@codemirror/legacy-modes/mode/lua';
 import { properties } from '@codemirror/legacy-modes/mode/properties';
 import { python } from '@codemirror/legacy-modes/mode/python';
 import { ruby } from '@codemirror/legacy-modes/mode/ruby';
-import { rustLanguage } from '@codemirror/lang-rust';
+import { rust } from '@codemirror/lang-rust';
 import { shell } from '@codemirror/legacy-modes/mode/shell';
 import { toml } from '@codemirror/legacy-modes/mode/toml';
-import { xmlLanguage } from '@codemirror/lang-xml';
+import { xml } from '@codemirror/lang-xml';
 import { yaml } from '@codemirror/legacy-modes/mode/yaml';
 import React, { useCallback, useEffect, useState } from 'react';
 import tw, { styled, TwStyle } from 'twin.macro';
@@ -42,29 +42,29 @@ import { ayuMirage } from '@/components/elements/EditorTheme';
 type EditorMode = LanguageSupport | LRLanguage | StreamParser<unknown>;
 
 export interface Mode {
-    name: string,
-    mime: string,
-    mimes?: string[],
-    mode?: EditorMode,
-    ext?: string[],
-    alias?: string[],
-    file?: RegExp,
+    name: string;
+    mime: string;
+    mimes?: string[];
+    mode?: EditorMode;
+    ext?: string[];
+    alias?: string[];
+    file?: RegExp;
 }
 
 export const modes: Mode[] = [
     { name: 'C', mime: 'text/x-csrc', mode: clike({}), ext: [ 'c', 'h', 'ino' ] },
-    { name: 'C++', mime: 'text/x-c++src', mode: cppLanguage, ext: [ 'cpp', 'c++', 'cc', 'cxx', 'hpp', 'h++', 'hh', 'hxx' ], alias: [ 'cpp' ] },
+    { name: 'C++', mime: 'text/x-c++src', mode: cpp(), ext: [ 'cpp', 'c++', 'cc', 'cxx', 'hpp', 'h++', 'hh', 'hxx' ], alias: [ 'cpp' ] },
     { name: 'C#', mime: 'text/x-csharp', mode: clike({}), ext: [ 'cs' ], alias: [ 'csharp', 'cs' ] },
-    { name: 'CSS', mime: 'text/css', mode: cssLanguage, ext: [ 'css' ] },
+    { name: 'CSS', mime: 'text/css', mode: css(), ext: [ 'css' ] },
     { name: 'CQL', mime: 'text/x-cassandra', mode: sql({ dialect: Cassandra }), ext: [ 'cql' ] },
     { name: 'Diff', mime: 'text/x-diff', mode: diff, ext: [ 'diff', 'patch' ] },
     { name: 'Dockerfile', mime: 'text/x-dockerfile', mode: dockerFile, file: /^Dockerfile$/ },
     { name: 'Git Markdown', mime: 'text/x-gfm', mode: markdown({ defaultCodeLanguage: markdownLanguage }), file: /^(readme|contributing|history|license).md$/i },
     { name: 'Golang', mime: 'text/x-go', mode: go, ext: [ 'go' ] },
-    { name: 'HTML', mime: 'text/html', mode: htmlLanguage, ext: [ 'html', 'htm', 'handlebars', 'hbs' ], alias: [ 'xhtml' ] },
+    { name: 'HTML', mime: 'text/html', mode: html(), ext: [ 'html', 'htm', 'handlebars', 'hbs' ], alias: [ 'xhtml' ] },
     { name: 'HTTP', mime: 'message/http', mode: http },
-    { name: 'JavaScript', mime: 'text/javascript', mimes: [ 'text/javascript', 'text/ecmascript', 'application/javascript', 'application/x-javascript', 'application/ecmascript' ], mode: javascriptLanguage, ext: [ 'js' ], alias: [ 'ecmascript', 'js', 'node' ] },
-    { name: 'JSON', mime: 'application/json', mimes: [ 'application/json', 'application/x-json' ], mode: jsonLanguage, ext: [ 'json', 'map' ], alias: [ 'json5' ] },
+    { name: 'JavaScript', mime: 'text/javascript', mimes: [ 'text/javascript', 'text/ecmascript', 'application/javascript', 'application/x-javascript', 'application/ecmascript' ], mode: javascript(), ext: [ 'js' ], alias: [ 'ecmascript', 'js', 'node' ] },
+    { name: 'JSON', mime: 'application/json', mimes: [ 'application/json', 'application/x-json' ], mode: json(), ext: [ 'json', 'json5', 'map' ], alias: [ 'json5' ] },
     { name: 'Lua', mime: 'text/x-lua', mode: lua, ext: [ 'lua' ] },
     { name: 'Markdown', mime: 'text/x-markdown', mode: markdown({ defaultCodeLanguage: markdownLanguage }), ext: [ 'markdown', 'md', 'mkd' ] },
     { name: 'MariaDB', mime: 'text/x-mariadb', mode: sql({ dialect: MariaSQL }) },
@@ -75,15 +75,15 @@ export const modes: Mode[] = [
     { name: 'Properties', mime: 'text/x-properties', mode: properties, ext: [ 'properties', 'ini', 'in' ], alias: [ 'ini', 'properties' ] },
     { name: 'Python', mime: 'text/x-python', mode: python, ext: [ 'BUILD', 'bzl', 'py', 'pyw' ], file: /^(BUCK|BUILD)$/ },
     { name: 'Ruby', mime: 'text/x-ruby', mode: ruby, ext: [ 'rb' ], alias: [ 'jruby', 'macruby', 'rake', 'rb', 'rbx' ] },
-    { name: 'Rust', mime: 'text/x-rustsrc', mode: rustLanguage, ext: [ 'rs' ] },
-    { name: 'Sass', mime: 'text/x-sass', mode: cssLanguage, ext: [ 'sass' ] },
-    { name: 'SCSS', mime: 'text/x-scss', mode: cssLanguage, ext: [ 'scss' ] },
+    { name: 'Rust', mime: 'text/x-rustsrc', mode: rust(), ext: [ 'rs' ] },
+    { name: 'Sass', mime: 'text/x-sass', mode: css(), ext: [ 'sass' ] },
+    { name: 'SCSS', mime: 'text/x-scss', mode: css(), ext: [ 'scss' ] },
     { name: 'Shell', mime: 'text/x-sh', mimes: [ 'text/x-sh', 'application/x-sh' ], mode: shell, ext: [ 'sh', 'ksh', 'bash' ], alias: [ 'bash', 'sh', 'zsh' ], file: /^PKGBUILD$/ },
     { name: 'SQL', mime: 'text/x-sql', mode: sql({ dialect: StandardSQL }), ext: [ 'sql' ] },
     { name: 'SQLite', mime: 'text/x-sqlite', mode: sql({ dialect: SQLite }) },
     { name: 'TOML', mime: 'text/x-toml', mode: toml, ext: [ 'toml' ] },
     { name: 'TypeScript', mime: 'application/typescript', mode: typescriptLanguage, ext: [ 'ts' ], alias: [ 'ts' ] },
-    { name: 'XML', mime: 'application/xml', mimes: [ 'application/xml', 'text/xml' ], mode: xmlLanguage, ext: [ 'xml', 'xsl', 'xsd', 'svg' ], alias: [ 'rss', 'wsdl', 'xsd' ] },
+    { name: 'XML', mime: 'application/xml', mimes: [ 'application/xml', 'text/xml' ], mode: xml(), ext: [ 'xml', 'xsl', 'xsd', 'svg' ], alias: [ 'rss', 'wsdl', 'xsd' ] },
     { name: 'YAML', mime: 'text/x-yaml', mimes: [ 'text/x-yaml', 'text/yaml' ], mode: yaml, ext: [ 'yaml', 'yml' ], alias: [ 'yml' ] },
 ];
 
@@ -203,25 +203,28 @@ export interface Props {
 export default ({ className, style, overrides, initialContent, extensions, mode, filename, onModeChanged, fetchContent, onContentSaved }: Props) => {
     const [ languageConfig ] = useState<Compartment>(new Compartment());
     const [ keybinds ] = useState<Compartment>(new Compartment());
-    const [ state ] = useState<EditorState>(EditorState.create({
-        doc: initialContent,
-        extensions: [
-            ...defaultExtensions,
-            ...(extensions !== undefined ? extensions : []),
-
-            languageConfig.of(mode !== undefined ? modeToExtension(mode) : findLanguageExtensionByMode(findModeByFilename(filename || ''))),
-            keybinds.of([]),
-        ],
-    }));
     const [ view, setView ] = useState<EditorView>();
 
+    const createEditorState = () => {
+        return EditorState.create({
+            doc: initialContent,
+            extensions: [
+                ...defaultExtensions,
+                ...(extensions !== undefined ? extensions : []),
+
+                languageConfig.of(mode !== undefined ? modeToExtension(mode) : findLanguageExtensionByMode(findModeByFilename(filename || ''))),
+                keybinds.of([]),
+            ],
+        });
+    };
+
     const ref = useCallback((node) => {
         if (!node) {
             return;
         }
 
         const view = new EditorView({
-            state: state,
+            state: createEditorState(),
             parent: node,
         });
         setView(view);
@@ -277,9 +280,9 @@ export default ({ className, style, overrides, initialContent, extensions, mode,
             return;
         }
 
-        view.dispatch({
-            changes: { from: 0, insert: initialContent },
-        });
+        // We could dispatch a view update to replace the content, but this would keep the edit history,
+        // and previously would duplicate the content of the editor.
+        view.setState(createEditorState());
     }, [ initialContent ]);
 
     useEffect(() => {
diff --git a/resources/scripts/components/elements/Field.tsx b/resources/scripts/components/elements/Field.tsx
index 5840983ed..2d86529fd 100644
--- a/resources/scripts/components/elements/Field.tsx
+++ b/resources/scripts/components/elements/Field.tsx
@@ -1,9 +1,9 @@
-import React, { forwardRef } from 'react';
 import { Field as FormikField, FieldProps } from 'formik';
+import React, { forwardRef } from 'react';
+import tw, { styled } from 'twin.macro';
 import Input, { Textarea } from '@/components/elements/Input';
-import Label from '@/components/elements/Label';
 import InputError from '@/components/elements/InputError';
-import tw from 'twin.macro';
+import Label from '@/components/elements/Label';
 
 interface OwnProps {
     name: string;
@@ -11,15 +11,17 @@ interface OwnProps {
     label?: string;
     description?: string;
     validate?: (value: any) => undefined | string | Promise<any>;
+
+    className?: string;
 }
 
 type Props = OwnProps & Omit<React.InputHTMLAttributes<HTMLInputElement>, 'name'>;
 
-const Field = forwardRef<HTMLInputElement, Props>(({ id, name, light = false, label, description, validate, ...props }, ref) => (
+const Field = forwardRef<HTMLInputElement, Props>(({ id, name, light = false, label, description, validate, className, ...props }, ref) => (
     <FormikField innerRef={ref} name={name} validate={validate}>
         {
             ({ field, form: { errors, touched } }: FieldProps) => (
-                <div>
+                <div className={className}>
                     {label &&
                     <div css={tw`flex flex-row`} title={description}>
                         <Label htmlFor={id} isLight={light}>{label}</Label>
@@ -43,15 +45,17 @@ const Field = forwardRef<HTMLInputElement, Props>(({ id, name, light = false, la
 ));
 Field.displayName = 'Field';
 
-type Props2 = OwnProps & Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'name'>;
+export default Field;
 
-export const TextareaField = forwardRef<HTMLTextAreaElement, Props2>(
-    function TextareaField ({ id, name, light = false, label, description, validate, ...props }, ref) {
+type TextareaProps = OwnProps & Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement>, 'name'>;
+
+export const TextareaField = forwardRef<HTMLTextAreaElement, TextareaProps>(
+    function TextareaField ({ id, name, light = false, label, description, validate, className, ...props }, ref) {
         return (
             <FormikField innerRef={ref} name={name} validate={validate}>
                 {
                     ({ field, form: { errors, touched } }: FieldProps) => (
-                        <div>
+                        <div className={className}>
                             {label && <Label htmlFor={id} isLight={light}>{label}</Label>}
                             <Textarea
                                 id={id}
@@ -72,4 +76,10 @@ export const TextareaField = forwardRef<HTMLTextAreaElement, Props2>(
 );
 TextareaField.displayName = 'TextareaField';
 
-export default Field;
+export const FieldRow = styled.div`
+    ${tw`grid grid-cols-1 sm:grid-cols-2 gap-x-6 gap-y-6 mb-6`};
+
+    & > div {
+        ${tw`sm:w-full sm:flex sm:flex-col`};
+    }
+`;
diff --git a/resources/scripts/components/elements/Label.tsx b/resources/scripts/components/elements/Label.tsx
index ad354e708..36a1ddbd8 100644
--- a/resources/scripts/components/elements/Label.tsx
+++ b/resources/scripts/components/elements/Label.tsx
@@ -1,7 +1,8 @@
 import tw, { styled } from 'twin.macro';
 
-const Label = styled.label<{ isLight?: boolean }>`
-    ${tw`block text-xs uppercase text-neutral-200 mb-1 sm:mb-2`};
+const Label = styled.label<{ isLight?: boolean, noBottomSpacing?: boolean }>`
+    ${tw`block text-xs uppercase text-neutral-200`};
+    ${props => !props.noBottomSpacing && tw`mb-1 sm:mb-2`};
     ${props => props.isLight && tw`text-neutral-700`};
 `;
 
diff --git a/resources/scripts/components/elements/PageContentBlock.tsx b/resources/scripts/components/elements/PageContentBlock.tsx
index f4454377f..0bb06a464 100644
--- a/resources/scripts/components/elements/PageContentBlock.tsx
+++ b/resources/scripts/components/elements/PageContentBlock.tsx
@@ -28,15 +28,15 @@ const PageContentBlock: React.FC<PageContentBlockProps> = ({ title, showFlashKey
                 </ContentContainer>
                 <ContentContainer css={tw`mb-4`}>
                     <p css={tw`text-center text-neutral-500 text-xs`}>
-                        &copy; 2015 - {(new Date()).getFullYear()}&nbsp;
                         <a
                             rel={'noopener nofollow noreferrer'}
                             href={'https://pterodactyl.io'}
                             target={'_blank'}
                             css={tw`no-underline text-neutral-500 hover:text-neutral-300`}
                         >
-                            Pterodactyl Software
+                            Pterodactyl&reg;
                         </a>
+                        &nbsp;&copy; 2015 - {(new Date()).getFullYear()}
                     </p>
                 </ContentContainer>
             </>
diff --git a/resources/scripts/components/elements/SearchableSelect.tsx b/resources/scripts/components/elements/SearchableSelect.tsx
index a8ef62e2a..a2558161d 100644
--- a/resources/scripts/components/elements/SearchableSelect.tsx
+++ b/resources/scripts/components/elements/SearchableSelect.tsx
@@ -178,6 +178,7 @@ export const SearchableSelect = <T extends IdObj>({ id, name, label, placeholder
             }
 
             setSelected(item);
+            onSelect(item);
         }
     };
 
@@ -244,9 +245,11 @@ export const SearchableSelect = <T extends IdObj>({ id, name, label, placeholder
 
     return (
         <div className={className}>
-            <Label htmlFor={id + '-select-label'}>{label}</Label>
+            <div css={tw`flex flex-row`}>
+                <Label htmlFor={id + '-select-label'}>{label}</Label>
+            </div>
 
-            <div css={tw`relative mt-1`}>
+            <div css={tw`relative`}>
                 <InputSpinner visible={loading}>
                     <Input
                         ref={searchInput}
diff --git a/resources/scripts/components/elements/Switch.tsx b/resources/scripts/components/elements/Switch.tsx
index 68bac5466..70523721c 100644
--- a/resources/scripts/components/elements/Switch.tsx
+++ b/resources/scripts/components/elements/Switch.tsx
@@ -40,11 +40,12 @@ export interface SwitchProps {
     label?: string;
     description?: string;
     defaultChecked?: boolean;
+    readOnly?: boolean;
     onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
     children?: React.ReactNode;
 }
 
-const Switch = ({ name, label, description, defaultChecked, onChange, children }: SwitchProps) => {
+const Switch = ({ name, label, description, defaultChecked, readOnly, onChange, children }: SwitchProps) => {
     const uuid = useMemo(() => v4(), []);
 
     return (
@@ -57,6 +58,7 @@ const Switch = ({ name, label, description, defaultChecked, onChange, children }
                     type={'checkbox'}
                     onChange={e => onChange && onChange(e)}
                     defaultChecked={defaultChecked}
+                    disabled={readOnly}
                 />
                 }
                 <Label htmlFor={uuid}/>
diff --git a/resources/scripts/components/helpers.ts b/resources/scripts/components/helpers.ts
new file mode 100644
index 000000000..47b9d5f00
--- /dev/null
+++ b/resources/scripts/components/helpers.ts
@@ -0,0 +1,9 @@
+import { StyledComponent } from 'styled-components/macro';
+
+export const withSubComponents = <C extends StyledComponent<any, any>, P extends Record<string, any>> (component: C, properties: P): C & P => {
+    Object.keys(properties).forEach((key: keyof P) => {
+        (component as any)[key] = properties[key];
+    });
+
+    return component as C & P;
+};
diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx
index 8c6eba1f8..bc36dd33c 100644
--- a/resources/scripts/components/server/ServerConsole.tsx
+++ b/resources/scripts/components/server/ServerConsole.tsx
@@ -7,7 +7,7 @@ import ServerContentBlock from '@/components/elements/ServerContentBlock';
 import ServerDetailsBlock from '@/components/server/ServerDetailsBlock';
 import isEqual from 'react-fast-compare';
 import PowerControls from '@/components/server/PowerControls';
-import { EulaModalFeature, JavaVersionModalFeature } from 'feature/index';
+import { EulaModalFeature, JavaVersionModalFeature, GSLTokenModalFeature, PIDLimitModalFeature, SteamDiskSpaceFeature } from '@feature/index';
 import ErrorBoundary from '@/components/elements/ErrorBoundary';
 import Spinner from '@/components/elements/Spinner';
 
@@ -60,6 +60,9 @@ const ServerConsole = () => {
                 <React.Suspense fallback={null}>
                     {eggFeatures.includes('eula') && <EulaModalFeature/>}
                     {eggFeatures.includes('java_version') && <JavaVersionModalFeature/>}
+                    {eggFeatures.includes('gsl_token') && <GSLTokenModalFeature/>}
+                    {eggFeatures.includes('pid_limit') && <PIDLimitModalFeature/>}
+                    {eggFeatures.includes('steam_disk_space') && <SteamDiskSpaceFeature/>}
                 </React.Suspense>
             </div>
         </ServerContentBlock>
diff --git a/resources/scripts/components/server/ServerDetailsBlock.tsx b/resources/scripts/components/server/ServerDetailsBlock.tsx
index 6df4a764c..34d975b81 100644
--- a/resources/scripts/components/server/ServerDetailsBlock.tsx
+++ b/resources/scripts/components/server/ServerDetailsBlock.tsx
@@ -2,19 +2,21 @@ import React, { useEffect, useState } from 'react';
 import tw, { TwStyle } from 'twin.macro';
 import { faCircle, faEthernet, faHdd, faMemory, faMicrochip, faServer } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { bytesToHuman, megabytesToHuman } from '@/helpers';
+import { bytesToHuman, megabytesToHuman, formatIp } from '@/helpers';
 import TitledGreyBox from '@/components/elements/TitledGreyBox';
 import { ServerContext } from '@/state/server';
 import CopyOnClick from '@/components/elements/CopyOnClick';
 import { SocketEvent, SocketRequest } from '@/components/server/events';
+import UptimeDuration from '@/components/server/UptimeDuration';
 
 interface Stats {
     memory: number;
     cpu: number;
     disk: number;
+    uptime: number;
 }
 
-function statusToColor (status: string|null, installing: boolean): TwStyle {
+function statusToColor (status: string | null, installing: boolean): TwStyle {
     if (installing) {
         status = '';
     }
@@ -30,7 +32,7 @@ function statusToColor (status: string|null, installing: boolean): TwStyle {
 }
 
 const ServerDetailsBlock = () => {
-    const [ stats, setStats ] = useState<Stats>({ memory: 0, cpu: 0, disk: 0 });
+    const [ stats, setStats ] = useState<Stats>({ memory: 0, cpu: 0, disk: 0, uptime: 0 });
 
     const status = ServerContext.useStoreState(state => state.status.value);
     const connected = ServerContext.useStoreState(state => state.socket.connected);
@@ -48,6 +50,7 @@ const ServerDetailsBlock = () => {
             memory: stats.memory_bytes,
             cpu: stats.cpu_absolute,
             disk: stats.disk_bytes,
+            uptime: stats.uptime || 0,
         });
     };
 
@@ -69,7 +72,7 @@ const ServerDetailsBlock = () => {
     const isTransferring = ServerContext.useStoreState(state => state.server.data!.isTransferring);
     const limits = ServerContext.useStoreState(state => state.server.data!.limits);
     const primaryAllocation = ServerContext.useStoreState(state => state.server.data!.allocations.filter(alloc => alloc.isDefault).map(
-        allocation => (allocation.alias || allocation.ip) + ':' + allocation.port
+        allocation => (allocation.alias || formatIp(allocation.ip)) + ':' + allocation.port,
     )).toString();
 
     const diskLimit = limits.disk ? megabytesToHuman(limits.disk) : 'Unlimited';
@@ -88,6 +91,11 @@ const ServerDetailsBlock = () => {
                     ]}
                 />
                 &nbsp;{!status ? 'Connecting...' : (isInstalling ? 'Installing' : (isTransferring) ? 'Transferring' : status)}
+                {stats.uptime > 0 &&
+                <span css={tw`ml-2 lowercase`}>
+                    (<UptimeDuration uptime={stats.uptime / 1000}/>)
+                </span>
+                }
             </p>
             <CopyOnClick text={primaryAllocation}>
                 <p css={tw`text-xs mt-2`}>
diff --git a/resources/scripts/components/server/StatGraphs.tsx b/resources/scripts/components/server/StatGraphs.tsx
index cccd199f7..8e66f393a 100644
--- a/resources/scripts/components/server/StatGraphs.tsx
+++ b/resources/scripts/components/server/StatGraphs.tsx
@@ -97,6 +97,7 @@ export default () => {
         setCpu(
             new Chart(node.getContext('2d')!, chartDefaults({
                 callback: (value) => `${value}%  `,
+                suggestedMax: limits.cpu,
             })),
         );
     }, []);
diff --git a/resources/scripts/components/server/UptimeDuration.tsx b/resources/scripts/components/server/UptimeDuration.tsx
new file mode 100644
index 000000000..98c613a72
--- /dev/null
+++ b/resources/scripts/components/server/UptimeDuration.tsx
@@ -0,0 +1,15 @@
+import React from 'react';
+
+export default ({ uptime }: { uptime: number }) => {
+    const days = Math.floor(uptime / (24 * 60 * 60));
+    const hours = Math.floor(Math.floor(uptime) / 60 / 60 % 24);
+    const remainder = Math.floor(uptime - (hours * 60 * 60));
+    const minutes = Math.floor(remainder / 60 % 60);
+    const seconds = remainder % 60;
+
+    if (days > 0) {
+        return <>{days}d {hours}h {minutes}m</>;
+    }
+
+    return <>{hours}h {minutes}m {seconds}s</>;
+};
diff --git a/resources/scripts/components/server/backups/BackupContainer.tsx b/resources/scripts/components/server/backups/BackupContainer.tsx
index 1201252b5..7be95aab1 100644
--- a/resources/scripts/components/server/backups/BackupContainer.tsx
+++ b/resources/scripts/components/server/backups/BackupContainer.tsx
@@ -25,7 +25,7 @@ const BackupContainer = () => {
             return;
         }
 
-        clearAndAddHttpError({ error, key: 'backups' });
+        clearAndAddHttpError({ key: 'backups', error });
     }, [ error ]);
 
     if (!backups || (error && isValidating)) {
diff --git a/resources/scripts/components/server/databases/DatabaseRow.tsx b/resources/scripts/components/server/databases/DatabaseRow.tsx
index bb8ed59e2..10ecace58 100644
--- a/resources/scripts/components/server/databases/DatabaseRow.tsx
+++ b/resources/scripts/components/server/databases/DatabaseRow.tsx
@@ -76,7 +76,7 @@ export default ({ database, className }: Props) => {
                             <FlashMessageRender byKey={'database:delete'} css={tw`mb-6`}/>
                             <h2 css={tw`text-2xl mb-6`}>Confirm database deletion</h2>
                             <p css={tw`text-sm`}>
-                                Deleting a database is a permanent action, it cannot be undone. This will permanetly
+                                Deleting a database is a permanent action, it cannot be undone. This will permanently
                                 delete the <strong>{database.name}</strong> database and remove all associated data.
                             </p>
                             <Form css={tw`m-0 mt-6`}>
diff --git a/resources/scripts/components/server/features/eula/EulaModalFeature.tsx b/resources/scripts/components/server/features/EulaModalFeature.tsx
similarity index 100%
rename from resources/scripts/components/server/features/eula/EulaModalFeature.tsx
rename to resources/scripts/components/server/features/EulaModalFeature.tsx
diff --git a/resources/scripts/components/server/features/GSLTokenModalFeature.tsx b/resources/scripts/components/server/features/GSLTokenModalFeature.tsx
new file mode 100644
index 000000000..6cd96ec0d
--- /dev/null
+++ b/resources/scripts/components/server/features/GSLTokenModalFeature.tsx
@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from 'react';
+import { ServerContext } from '@/state/server';
+import Modal from '@/components/elements/Modal';
+import tw from 'twin.macro';
+import Button from '@/components/elements/Button';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import useFlash from '@/plugins/useFlash';
+import { SocketEvent, SocketRequest } from '@/components/server/events';
+import Field from '@/components/elements/Field';
+import updateStartupVariable from '@/api/server/updateStartupVariable';
+import { Form, Formik } from 'formik';
+
+interface Values {
+    gslToken: string;
+}
+
+const GSLTokenModalFeature = () => {
+    const [ visible, setVisible ] = useState(false);
+    const [ loading, setLoading ] = useState(false);
+
+    const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
+    const status = ServerContext.useStoreState(state => state.status.value);
+    const { clearFlashes, clearAndAddHttpError } = useFlash();
+    const { connected, instance } = ServerContext.useStoreState(state => state.socket);
+
+    useEffect(() => {
+        if (!connected || !instance || status === 'running') return;
+
+        const errors = [
+            '(gsl token expired)',
+            '(account not found)',
+        ];
+
+        const listener = (line: string) => {
+            if (errors.some(p => line.toLowerCase().includes(p))) {
+                setVisible(true);
+            }
+        };
+
+        instance.addListener(SocketEvent.CONSOLE_OUTPUT, listener);
+
+        return () => {
+            instance.removeListener(SocketEvent.CONSOLE_OUTPUT, listener);
+        };
+    }, [ connected, instance, status ]);
+
+    const updateGSLToken = (values: Values) => {
+        setLoading(true);
+        clearFlashes('feature:gslToken');
+
+        updateStartupVariable(uuid, 'STEAM_ACC', values.gslToken)
+            .then(() => {
+                if (instance) {
+                    instance.send(SocketRequest.SET_STATE, 'restart');
+                }
+
+                setLoading(false);
+                setVisible(false);
+            })
+            .catch(error => {
+                console.error(error);
+                clearAndAddHttpError({ key: 'feature:gslToken', error });
+            })
+            .then(() => setLoading(false));
+    };
+
+    useEffect(() => {
+        clearFlashes('feature:gslToken');
+    }, []);
+
+    return (
+        <Formik
+            onSubmit={updateGSLToken}
+            initialValues={{ gslToken: '' }}
+        >
+            <Modal visible={visible} onDismissed={() => setVisible(false)} closeOnBackground={false} showSpinnerOverlay={loading}>
+                <FlashMessageRender key={'feature:gslToken'} css={tw`mb-4`}/>
+                <Form>
+                    <h2 css={tw`text-2xl mb-4 text-neutral-100`}>Invalid GSL token!</h2>
+                    <p css={tw`mt-4`}>It seems like your Gameserver Login Token (GSL token) is invalid or has expired.</p>
+                    <p css={tw`mt-4`}>You can either generate a new one and enter it below or leave the field blank to remove it completely.</p>
+                    <div css={tw`sm:flex items-center mt-4`}>
+                        <Field
+                            name={'gslToken'}
+                            label={'GSL Token'}
+                            description={'Visit https://steamcommunity.com/dev/managegameservers to generate a token.'}
+                            autoFocus
+                        />
+                    </div>
+                    <div css={tw`mt-8 sm:flex items-center justify-end`}>
+                        <Button type={'submit'} css={tw`mt-4 sm:mt-0 sm:ml-4 w-full sm:w-auto`}>
+                            Update GSL Token
+                        </Button>
+                    </div>
+                </Form>
+            </Modal>
+        </Formik>
+    );
+};
+
+export default GSLTokenModalFeature;
diff --git a/resources/scripts/components/server/features/java_version/JavaVersionModalFeature.tsx b/resources/scripts/components/server/features/JavaVersionModalFeature.tsx
similarity index 83%
rename from resources/scripts/components/server/features/java_version/JavaVersionModalFeature.tsx
rename to resources/scripts/components/server/features/JavaVersionModalFeature.tsx
index 3756b55b0..f15b9abbb 100644
--- a/resources/scripts/components/server/features/java_version/JavaVersionModalFeature.tsx
+++ b/resources/scripts/components/server/features/JavaVersionModalFeature.tsx
@@ -10,15 +10,16 @@ import { SocketEvent, SocketRequest } from '@/components/server/events';
 import Select from '@/components/elements/Select';
 
 const dockerImageList = [
-    { name: 'Java 8', image: 'ghcr.io/pterodactyl/yolks:java_8' },
-    { name: 'Java 11', image: 'ghcr.io/pterodactyl/yolks:java_11' },
+    { name: 'Java 17', image: 'ghcr.io/pterodactyl/yolks:java_17' },
     { name: 'Java 16', image: 'ghcr.io/pterodactyl/yolks:java_16' },
+    { name: 'Java 11', image: 'ghcr.io/pterodactyl/yolks:java_11' },
+    { name: 'Java 8', image: 'ghcr.io/pterodactyl/yolks:java_8' },
 ];
 
 const JavaVersionModalFeature = () => {
     const [ visible, setVisible ] = useState(false);
     const [ loading, setLoading ] = useState(false);
-    const [ selectedVersion, setSelectedVersion ] = useState('ghcr.io/pterodactyl/yolks:java_16');
+    const [ selectedVersion, setSelectedVersion ] = useState('ghcr.io/pterodactyl/yolks:java_17');
 
     const uuid = ServerContext.useStoreState(state => state.server.data!.uuid);
     const status = ServerContext.useStoreState(state => state.status.value);
@@ -30,6 +31,7 @@ const JavaVersionModalFeature = () => {
 
         const errors = [
             'minecraft 1.17 requires running the server with java 16 or above',
+            'minecraft 1.18 requires running the server with java 17 or above',
             'java.lang.unsupportedclassversionerror',
             'unsupported major.minor version',
             'has been compiled by a more recent version of the java runtime',
@@ -50,7 +52,7 @@ const JavaVersionModalFeature = () => {
 
     const updateJava = () => {
         setLoading(true);
-        clearFlashes('feature:javaVersion');
+        clearFlashes('feature:java-version');
 
         setSelectedDockerImage(uuid, selectedVersion)
             .then(() => {
@@ -63,39 +65,38 @@ const JavaVersionModalFeature = () => {
             })
             .catch(error => {
                 console.error(error);
-                clearAndAddHttpError({ key: 'feature:javaVersion', error });
+                clearAndAddHttpError({ key: 'feature:java-version', error });
             })
             .then(() => setLoading(false));
     };
 
     useEffect(() => {
-        clearFlashes('feature:javaVersion');
+        clearFlashes('feature:java-version');
     }, []);
 
     return (
         <Modal visible={visible} onDismissed={() => setVisible(false)} closeOnBackground={false} showSpinnerOverlay={loading}>
-            <FlashMessageRender key={'feature:javaVersion'} css={tw`mb-4`}/>
+            <FlashMessageRender key={'feature:java-version'} css={tw`mb-4`}/>
+
             <h2 css={tw`text-2xl mb-4 text-neutral-100`}>Invalid Java version, update Docker image?</h2>
             <p css={tw`mt-4`}>This server is unable to start due to the required Java version not being met.</p>
             <p css={tw`mt-4`}>By pressing {'"Update Docker Image"'} below you are acknowledging that the Docker image this server uses will be changed to an image below that has the Java version you are requesting.</p>
+
             <div css={tw`sm:flex items-center mt-4`}>
                 <p>Please select a Java version from the list below.</p>
-                <Select
-                    onChange={e => setSelectedVersion(e.target.value)}
-                >
-                    {dockerImageList.map((key, index) => {
-                        return (
-                            <option key={index} value={key.image}>{key.name}</option>
-                        );
-                    })}
+                <Select onChange={e => setSelectedVersion(e.target.value)}>
+                    {dockerImageList.map((key, index) => (
+                        <option key={index} value={key.image}>{key.name}</option>
+                    ))}
                 </Select>
             </div>
+
             <div css={tw`mt-8 sm:flex items-center justify-end`}>
                 <Button isSecondary onClick={() => setVisible(false)} css={tw`w-full sm:w-auto border-transparent`}>
-                        Cancel
+                    Cancel
                 </Button>
                 <Button onClick={updateJava} css={tw`mt-4 sm:mt-0 sm:ml-4 w-full sm:w-auto`}>
-                        Update Docker Image
+                    Update Docker Image
                 </Button>
             </div>
         </Modal>
diff --git a/resources/scripts/components/server/features/PIDLimitModalFeature.tsx b/resources/scripts/components/server/features/PIDLimitModalFeature.tsx
new file mode 100644
index 000000000..9d0a57eb6
--- /dev/null
+++ b/resources/scripts/components/server/features/PIDLimitModalFeature.tsx
@@ -0,0 +1,88 @@
+import React, { useEffect, useState } from 'react';
+import { ServerContext } from '@/state/server';
+import Modal from '@/components/elements/Modal';
+import tw from 'twin.macro';
+import Button from '@/components/elements/Button';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import useFlash from '@/plugins/useFlash';
+import { SocketEvent } from '@/components/server/events';
+import { useStoreState } from 'easy-peasy';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
+
+const PIDLimitModalFeature = () => {
+    const [ visible, setVisible ] = useState(false);
+    const [ loading ] = useState(false);
+
+    const status = ServerContext.useStoreState(state => state.status.value);
+    const { clearFlashes } = useFlash();
+    const { connected, instance } = ServerContext.useStoreState(state => state.socket);
+    const isAdmin = useStoreState(state => state.user.data!.rootAdmin);
+
+    useEffect(() => {
+        if (!connected || !instance || status === 'running') return;
+
+        const errors = [
+            'pthread_create failed',
+            'failed to create thread',
+            'unable to create thread',
+            'unable to create native thread',
+            'unable to create new native thread',
+            'exception in thread "craft async scheduler management thread"',
+        ];
+
+        const listener = (line: string) => {
+            if (errors.some(p => line.toLowerCase().includes(p))) {
+                setVisible(true);
+            }
+        };
+
+        instance.addListener(SocketEvent.CONSOLE_OUTPUT, listener);
+
+        return () => {
+            instance.removeListener(SocketEvent.CONSOLE_OUTPUT, listener);
+        };
+    }, [ connected, instance, status ]);
+
+    useEffect(() => {
+        clearFlashes('feature:pidLimit');
+    }, []);
+
+    return (
+        <Modal visible={visible} onDismissed={() => setVisible(false)} closeOnBackground={false} showSpinnerOverlay={loading}>
+            <FlashMessageRender key={'feature:pidLimit'} css={tw`mb-4`} />
+            {isAdmin ?
+                <>
+                    <div css={tw`mt-4 sm:flex items-center`}>
+                        <FontAwesomeIcon css={tw`pr-4`} icon={faExclamationTriangle} color={'orange'} size={'4x'}/>
+                        <h2 css={tw`text-2xl mb-4 text-neutral-100 `}>Memory or process limit reached...</h2>
+                    </div>
+                    <p css={tw`mt-4`}>This server has reached the maximum process or memory limit.</p>
+                    <p css={tw`mt-4`}>Increasing <code css={tw`font-mono bg-neutral-900`}>container_pid_limit</code> in the wings configuration, <code css={tw`font-mono bg-neutral-900`}>config.yml</code>, might help resolve this issue.</p>
+                    <p css={tw`mt-4`}><b>Note: Wings must be restarted for the configuration file changes to take effect</b></p>
+                    <div css={tw`mt-8 sm:flex items-center justify-end`}>
+                        <Button onClick={() => setVisible(false)} css={tw`w-full sm:w-auto border-transparent`}>
+                            Close
+                        </Button>
+                    </div>
+                </>
+                :
+                <>
+                    <div css={tw`mt-4 sm:flex items-center`}>
+                        <FontAwesomeIcon css={tw`pr-4`} icon={faExclamationTriangle} color={'orange'} size={'4x'}/>
+                        <h2 css={tw`text-2xl mb-4 text-neutral-100`}>Possible resource limit reached...</h2>
+                    </div>
+                    <p css={tw`mt-4`}>This server is attempting to use more resources than allocated. Please contact the administrator and give them the error below.</p>
+                    <p css={tw`mt-4`}><code css={tw`font-mono bg-neutral-900`}>pthread_create failed, Possibly out of memory or process/resource limits reached</code></p>
+                    <div css={tw`mt-8 sm:flex items-center justify-end`}>
+                        <Button onClick={() => setVisible(false)} css={tw`w-full sm:w-auto border-transparent`}>
+                            Close
+                        </Button>
+                    </div>
+                </>
+            }
+        </Modal>
+    );
+};
+
+export default PIDLimitModalFeature;
diff --git a/resources/scripts/components/server/features/SteamDiskSpaceFeature.tsx b/resources/scripts/components/server/features/SteamDiskSpaceFeature.tsx
new file mode 100644
index 000000000..2694c9815
--- /dev/null
+++ b/resources/scripts/components/server/features/SteamDiskSpaceFeature.tsx
@@ -0,0 +1,78 @@
+import React, { useEffect, useState } from 'react';
+import { ServerContext } from '@/state/server';
+import Modal from '@/components/elements/Modal';
+import tw from 'twin.macro';
+import Button from '@/components/elements/Button';
+import FlashMessageRender from '@/components/FlashMessageRender';
+import useFlash from '@/plugins/useFlash';
+import { SocketEvent } from '@/components/server/events';
+import { useStoreState } from 'easy-peasy';
+
+const SteamDiskSpaceFeature = () => {
+    const [ visible, setVisible ] = useState(false);
+    const [ loading ] = useState(false);
+
+    const status = ServerContext.useStoreState(state => state.status.value);
+    const { clearFlashes } = useFlash();
+    const { connected, instance } = ServerContext.useStoreState(state => state.socket);
+    const isAdmin = useStoreState(state => state.user.data!.rootAdmin);
+
+    useEffect(() => {
+        if (!connected || !instance || status === 'running') return;
+
+        const errors = [
+            'steamcmd needs 250mb of free disk space to update',
+            '0x202 after update job',
+        ];
+
+        const listener = (line: string) => {
+            if (errors.some(p => line.toLowerCase().includes(p))) {
+                setVisible(true);
+            }
+        };
+
+        instance.addListener(SocketEvent.CONSOLE_OUTPUT, listener);
+
+        return () => {
+            instance.removeListener(SocketEvent.CONSOLE_OUTPUT, listener);
+        };
+    }, [ connected, instance, status ]);
+
+    useEffect(() => {
+        clearFlashes('feature:steamDiskSpace');
+    }, []);
+
+    return (
+        <Modal visible={visible} onDismissed={() => setVisible(false)} closeOnBackground={false} showSpinnerOverlay={loading}>
+            <FlashMessageRender key={'feature:steamDiskSpace'} css={tw`mb-4`} />
+            {isAdmin ?
+                <>
+                    <div css={tw`mt-4 sm:flex items-center`}>
+                        <h2 css={tw`text-2xl mb-4 text-neutral-100 `}>Out of available disk space...</h2>
+                    </div>
+                    <p css={tw`mt-4`}>This server has run out of available disk space and cannot complete the install or update process.</p>
+                    <p css={tw`mt-4`}>Ensure the machine has enough disk space by typing <code css={tw`font-mono bg-neutral-900 rounded py-1 px-2`}>df -h</code> on the machine hosting this server. Delete files or increase the available disk space to resolve the issue.</p>
+                    <div css={tw`mt-8 sm:flex items-center justify-end`}>
+                        <Button onClick={() => setVisible(false)} css={tw`w-full sm:w-auto border-transparent`}>
+                            Close
+                        </Button>
+                    </div>
+                </>
+                :
+                <>
+                    <div css={tw`mt-4 sm:flex items-center`}>
+                        <h2 css={tw`text-2xl mb-4 text-neutral-100`}>Out of available disk space...</h2>
+                    </div>
+                    <p css={tw`mt-4`}>This server has run out of available disk space and cannot complete the install or update process. Please get in touch with the administrator(s) and inform them of disk space issues.</p>
+                    <div css={tw`mt-8 sm:flex items-center justify-end`}>
+                        <Button onClick={() => setVisible(false)} css={tw`w-full sm:w-auto border-transparent`}>
+                            Close
+                        </Button>
+                    </div>
+                </>
+            }
+        </Modal>
+    );
+};
+
+export default SteamDiskSpaceFeature;
diff --git a/resources/scripts/components/server/features/index.ts b/resources/scripts/components/server/features/index.ts
index b9767940f..a0be5daef 100644
--- a/resources/scripts/components/server/features/index.ts
+++ b/resources/scripts/components/server/features/index.ts
@@ -6,7 +6,10 @@ import { lazy } from 'react';
  * whenever they are actually loaded for the client (which may be never, depending
  * on the feature and the egg).
  */
-const EulaModalFeature = lazy(() => import(/* webpackChunkName: "feature.eula" */'feature/eula/EulaModalFeature'));
-const JavaVersionModalFeature = lazy(() => import(/* webpackChunkName: "feature.java_version" */'feature/java_version/JavaVersionModalFeature'));
+const EulaModalFeature = lazy(() => import(/* webpackChunkName: "feature.eula" */'@feature/EulaModalFeature'));
+const JavaVersionModalFeature = lazy(() => import(/* webpackChunkName: "feature.java_version" */'@feature/JavaVersionModalFeature'));
+const GSLTokenModalFeature = lazy(() => import(/* webpackChunkName: "feature.gsl_token" */'@feature/GSLTokenModalFeature'));
+const PIDLimitModalFeature = lazy(() => import(/* webpackChunkName: "feature.pid_limit" */'@feature/PIDLimitModalFeature'));
+const SteamDiskSpaceFeature = lazy(() => import(/* webpackChunkName: "feature.steam_disk_space" */'@feature/SteamDiskSpaceFeature'));
 
-export { EulaModalFeature, JavaVersionModalFeature };
+export { EulaModalFeature, JavaVersionModalFeature, GSLTokenModalFeature, PIDLimitModalFeature, SteamDiskSpaceFeature };
diff --git a/resources/scripts/components/server/files/FileEditContainer.tsx b/resources/scripts/components/server/files/FileEditContainer.tsx
index db9bcb0da..34e7e141c 100644
--- a/resources/scripts/components/server/files/FileEditContainer.tsx
+++ b/resources/scripts/components/server/files/FileEditContainer.tsx
@@ -73,7 +73,7 @@ export default () => {
             })
             .catch(error => {
                 console.error(error);
-                addError({ message: httpErrorToHuman(error), key: 'files:view' });
+                addError({ key: 'files:view', message: httpErrorToHuman(error) });
             })
             .then(() => setLoading(false));
     };
diff --git a/resources/scripts/components/server/files/FileManagerContainer.tsx b/resources/scripts/components/server/files/FileManagerContainer.tsx
index 003a12648..4891f3a27 100644
--- a/resources/scripts/components/server/files/FileManagerContainer.tsx
+++ b/resources/scripts/components/server/files/FileManagerContainer.tsx
@@ -26,8 +26,8 @@ import { useStoreState } from 'easy-peasy';
 import { ApplicationStore } from '@/state';
 
 const sortFiles = (files: FileObject[]): FileObject[] => {
-    return files.sort((a, b) => a.name.localeCompare(b.name))
-        .sort((a, b) => a.isFile === b.isFile ? 0 : (a.isFile ? 1 : -1));
+    const sortedFiles: FileObject[] = files.sort((a, b) => a.name.localeCompare(b.name)).sort((a, b) => a.isFile === b.isFile ? 0 : (a.isFile ? 1 : -1));
+    return sortedFiles.filter((file, index) => index === 0 || file.name !== sortedFiles[index - 1].name);
 };
 
 export default () => {
diff --git a/resources/scripts/components/server/files/UploadButton.tsx b/resources/scripts/components/server/files/UploadButton.tsx
index e9c37aae9..67582129b 100644
--- a/resources/scripts/components/server/files/UploadButton.tsx
+++ b/resources/scripts/components/server/files/UploadButton.tsx
@@ -110,7 +110,7 @@ export default ({ className }: WithClassname) => {
             .then(() => mutate())
             .catch(error => {
                 console.error(error);
-                clearAndAddHttpError({ error, key: 'files' });
+                clearAndAddHttpError({ key: 'files', error });
             });
     };
 
diff --git a/resources/scripts/components/server/network/AllocationRow.tsx b/resources/scripts/components/server/network/AllocationRow.tsx
index 31fe249df..cc11e1db3 100644
--- a/resources/scripts/components/server/network/AllocationRow.tsx
+++ b/resources/scripts/components/server/network/AllocationRow.tsx
@@ -17,6 +17,7 @@ import CopyOnClick from '@/components/elements/CopyOnClick';
 import DeleteAllocationButton from '@/components/server/network/DeleteAllocationButton';
 import setPrimaryServerAllocation from '@/api/server/network/setPrimaryServerAllocation';
 import getServerAllocations from '@/api/swr/getServerAllocations';
+import { formatIp } from '@/helpers';
 
 const Code = styled.code`${tw`font-mono py-1 px-2 bg-neutral-900 rounded text-sm inline-block`}`;
 const Label = styled.label`${tw`uppercase text-xs mt-1 text-neutral-400 block px-1 select-none transition-colors duration-150`}`;
@@ -65,7 +66,7 @@ const AllocationRow = ({ allocation }: Props) => {
                 <div css={tw`mr-4 flex-1 md:w-40`}>
                     {allocation.alias ?
                         <CopyOnClick text={allocation.alias}><Code css={tw`w-40 truncate`}>{allocation.alias}</Code></CopyOnClick> :
-                        <CopyOnClick text={allocation.ip}><Code>{allocation.ip}</Code></CopyOnClick>}
+                        <CopyOnClick text={formatIp(allocation.ip)}><Code>{formatIp(allocation.ip)}</Code></CopyOnClick>}
                     <Label>{allocation.alias ? 'Hostname' : 'IP Address'}</Label>
                 </div>
                 <div css={tw`w-16 md:w-24 overflow-hidden`}>
diff --git a/resources/scripts/components/server/schedules/RunScheduleButton.tsx b/resources/scripts/components/server/schedules/RunScheduleButton.tsx
index 96424b06e..875de28f3 100644
--- a/resources/scripts/components/server/schedules/RunScheduleButton.tsx
+++ b/resources/scripts/components/server/schedules/RunScheduleButton.tsx
@@ -24,7 +24,7 @@ const RunScheduleButton = ({ schedule }: { schedule: Schedule }) => {
             })
             .catch(error => {
                 console.error(error);
-                clearAndAddHttpError({ error, key: 'schedules' });
+                clearAndAddHttpError({ key: 'schedules', error });
             })
             .then(() => setLoading(false));
     }, []);
diff --git a/resources/scripts/components/server/schedules/ScheduleContainer.tsx b/resources/scripts/components/server/schedules/ScheduleContainer.tsx
index c1609674a..958f3fef9 100644
--- a/resources/scripts/components/server/schedules/ScheduleContainer.tsx
+++ b/resources/scripts/components/server/schedules/ScheduleContainer.tsx
@@ -31,7 +31,7 @@ export default () => {
         getServerSchedules(uuid)
             .then(schedules => setSchedules(schedules))
             .catch(error => {
-                addError({ message: httpErrorToHuman(error), key: 'schedules' });
+                addError({ key: 'schedules', message: httpErrorToHuman(error) });
                 console.error(error);
             })
             .then(() => setLoading(false));
diff --git a/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx b/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx
index fdd602304..33fda7a06 100644
--- a/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx
+++ b/resources/scripts/components/server/schedules/ScheduleEditContainer.tsx
@@ -65,7 +65,7 @@ export default () => {
             .then(schedule => appendSchedule(schedule))
             .catch(error => {
                 console.error(error);
-                clearAndAddHttpError({ error, key: 'schedules' });
+                clearAndAddHttpError({ key: 'schedules', error });
             })
             .then(() => setIsLoading(false));
     }, [ scheduleId ]);
diff --git a/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx b/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
index 56515808b..d4bdcc0d6 100644
--- a/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
+++ b/resources/scripts/components/server/schedules/ScheduleTaskRow.tsx
@@ -58,7 +58,7 @@ export default ({ schedule, task }: Props) => {
             .catch(error => {
                 console.error(error);
                 setIsLoading(false);
-                addError({ message: httpErrorToHuman(error), key: 'schedules' });
+                addError({ key: 'schedules', message: httpErrorToHuman(error) });
             });
     };
 
diff --git a/resources/scripts/components/server/schedules/TaskDetailsModal.tsx b/resources/scripts/components/server/schedules/TaskDetailsModal.tsx
index f8eca30ae..7cc39f555 100644
--- a/resources/scripts/components/server/schedules/TaskDetailsModal.tsx
+++ b/resources/scripts/components/server/schedules/TaskDetailsModal.tsx
@@ -81,7 +81,7 @@ const TaskDetailsModal = ({ schedule, task }: Props) => {
         clearFlashes('schedule:task');
         if (backupLimit === 0 && values.action === 'backup') {
             setSubmitting(false);
-            addError({ message: 'A backup task cannot be created when the server\'s backup limit is set to 0.', key: 'schedule:task' });
+            addError({ key: 'schedule:task', message: 'A backup task cannot be created when the server\'s backup limit is set to 0.' });
         } else {
             createOrUpdateScheduleTask(uuid, schedule.id, task?.id, values)
                 .then(task => {
@@ -96,7 +96,7 @@ const TaskDetailsModal = ({ schedule, task }: Props) => {
                 .catch(error => {
                     console.error(error);
                     setSubmitting(false);
-                    addError({ message: httpErrorToHuman(error), key: 'schedule:task' });
+                    addError({ key: 'schedule:task', message: httpErrorToHuman(error) });
                 });
         }
     };
diff --git a/resources/scripts/components/server/settings/ReinstallServerBox.tsx b/resources/scripts/components/server/settings/ReinstallServerBox.tsx
index 83253d2bf..2ef8af921 100644
--- a/resources/scripts/components/server/settings/ReinstallServerBox.tsx
+++ b/resources/scripts/components/server/settings/ReinstallServerBox.tsx
@@ -16,12 +16,12 @@ export default () => {
     const { addFlash, clearFlashes } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
 
     const reinstall = () => {
-        clearFlashes('settings');
+        clearFlashes('server:settings');
         setIsSubmitting(true);
         reinstallServer(uuid)
             .then(() => {
                 addFlash({
-                    key: 'settings',
+                    key: 'server:settings',
                     type: 'success',
                     message: 'Your server has begun the reinstallation process.',
                 });
@@ -29,7 +29,7 @@ export default () => {
             .catch(error => {
                 console.error(error);
 
-                addFlash({ key: 'settings', type: 'error', message: httpErrorToHuman(error) });
+                addFlash({ key: 'server:settings', type: 'error', message: httpErrorToHuman(error) });
             })
             .then(() => {
                 setIsSubmitting(false);
diff --git a/resources/scripts/components/server/settings/RenameServerBox.tsx b/resources/scripts/components/server/settings/RenameServerBox.tsx
index 7e6832c6f..8ed91ca31 100644
--- a/resources/scripts/components/server/settings/RenameServerBox.tsx
+++ b/resources/scripts/components/server/settings/RenameServerBox.tsx
@@ -45,12 +45,12 @@ export default () => {
     const { addError, clearFlashes } = useStoreActions((actions: Actions<ApplicationStore>) => actions.flashes);
 
     const submit = ({ name }: Values, { setSubmitting }: FormikHelpers<Values>) => {
-        clearFlashes('settings');
+        clearFlashes('server:settings');
         renameServer(server.uuid, name)
             .then(() => setServer({ ...server, name }))
             .catch(error => {
                 console.error(error);
-                addError({ key: 'settings', message: httpErrorToHuman(error) });
+                addError({ key: 'server:settings', message: httpErrorToHuman(error) });
             })
             .then(() => setSubmitting(false));
     };
diff --git a/resources/scripts/components/server/settings/SettingsContainer.tsx b/resources/scripts/components/server/settings/SettingsContainer.tsx
index bad273803..53fc1bba7 100644
--- a/resources/scripts/components/server/settings/SettingsContainer.tsx
+++ b/resources/scripts/components/server/settings/SettingsContainer.tsx
@@ -13,6 +13,7 @@ import { LinkButton } from '@/components/elements/Button';
 import ServerContentBlock from '@/components/elements/ServerContentBlock';
 import isEqual from 'react-fast-compare';
 import CopyOnClick from '@/components/elements/CopyOnClick';
+import { formatIp } from '@/helpers';
 
 export default () => {
     const username = useStoreState(state => state.user.data!.username);
@@ -23,17 +24,18 @@ export default () => {
 
     return (
         <ServerContentBlock title={'Settings'}>
-            <FlashMessageRender byKey={'settings'} css={tw`mb-4`}/>
+            <FlashMessageRender byKey={'server:settings'} css={tw`mb-4`}/>
+
             <div css={tw`md:flex`}>
                 <div css={tw`w-full md:flex-1 md:mr-10`}>
                     <Can action={'file.sftp'}>
                         <TitledGreyBox title={'SFTP Details'} css={tw`mb-6 md:mb-10`}>
                             <div>
                                 <Label>Server Address</Label>
-                                <CopyOnClick text={`sftp://${sftp.ip}:${sftp.port}`}>
+                                <CopyOnClick text={`sftp://${formatIp(sftp.ip)}:${sftp.port}`}>
                                     <Input
                                         type={'text'}
-                                        value={`sftp://${sftp.ip}:${sftp.port}`}
+                                        value={`sftp://${formatIp(sftp.ip)}:${sftp.port}`}
                                         readOnly
                                     />
                                 </CopyOnClick>
@@ -59,7 +61,7 @@ export default () => {
                                 <div css={tw`ml-4`}>
                                     <LinkButton
                                         isSecondary
-                                        href={`sftp://${username}.${id}@${sftp.ip}:${sftp.port}`}
+                                        href={`sftp://${username}.${id}@${formatIp(sftp.ip)}:${sftp.port}`}
                                     >
                                         Launch SFTP
                                     </LinkButton>
diff --git a/resources/scripts/components/server/startup/VariableBox.tsx b/resources/scripts/components/server/startup/VariableBox.tsx
index 86b014f1f..3ab70a285 100644
--- a/resources/scripts/components/server/startup/VariableBox.tsx
+++ b/resources/scripts/components/server/startup/VariableBox.tsx
@@ -4,12 +4,14 @@ import TitledGreyBox from '@/components/elements/TitledGreyBox';
 import { usePermissions } from '@/plugins/usePermissions';
 import InputSpinner from '@/components/elements/InputSpinner';
 import Input from '@/components/elements/Input';
+import Switch from '@/components/elements/Switch';
 import tw from 'twin.macro';
 import { debounce } from 'debounce';
 import updateStartupVariable from '@/api/server/updateStartupVariable';
 import useFlash from '@/plugins/useFlash';
 import FlashMessageRender from '@/components/FlashMessageRender';
 import getServerStartup from '@/api/swr/getServerStartup';
+import Select from '@/components/elements/Select';
 import isEqual from 'react-fast-compare';
 import { ServerContext } from '@/state/server';
 
@@ -38,11 +40,14 @@ const VariableBox = ({ variable }: Props) => {
             }), false))
             .catch(error => {
                 console.error(error);
-                clearAndAddHttpError({ error, key: FLASH_KEY });
+                clearAndAddHttpError({ key: FLASH_KEY, error });
             })
             .then(() => setLoading(false));
     }, 500);
 
+    const useSwitch = variable.rules.some(v => v === 'boolean' || v === 'in:0,1');
+    const selectValues = variable.rules.find(v => v.startsWith('in:'))?.split(',') || [];
+
     return (
         <TitledGreyBox
             title={
@@ -56,17 +61,52 @@ const VariableBox = ({ variable }: Props) => {
         >
             <FlashMessageRender byKey={FLASH_KEY} css={tw`mb-2 md:mb-4`}/>
             <InputSpinner visible={loading}>
-                <Input
-                    onKeyUp={e => {
-                        if (canEdit && variable.isEditable) {
-                            setVariableValue(e.currentTarget.value);
+                {useSwitch ?
+                    <>
+                        <Switch
+                            readOnly={!canEdit || !variable.isEditable}
+                            name={variable.envVariable}
+                            defaultChecked={variable.serverValue === '1'}
+                            onChange={() => {
+                                if (canEdit && variable.isEditable) {
+                                    setVariableValue(variable.serverValue === '1' ? '0' : '1');
+                                }
+                            }}
+                        />
+                    </>
+                    :
+                    <>
+                        {selectValues.length > 0 ?
+                            <>
+                                <Select
+                                    onChange={e => setVariableValue(e.target.value)}
+                                    name={variable.envVariable}
+                                    defaultValue={variable.serverValue}
+                                    disabled={!canEdit || !variable.isEditable}
+                                >
+                                    {selectValues.map(selectValue => (
+                                        <option key={selectValue.replace('in:', '')} value={selectValue.replace('in:', '')}>{selectValue.replace('in:', '')}</option>
+                                    ))}
+                                </Select>
+
+                            </>
+                            :
+                            <>
+                                <Input
+                                    onKeyUp={e => {
+                                        if (canEdit && variable.isEditable) {
+                                            setVariableValue(e.currentTarget.value);
+                                        }
+                                    }}
+                                    readOnly={!canEdit || !variable.isEditable}
+                                    name={variable.envVariable}
+                                    defaultValue={variable.serverValue}
+                                    placeholder={variable.defaultValue}
+                                />
+                            </>
                         }
-                    }}
-                    readOnly={!canEdit || !variable.isEditable}
-                    name={variable.envVariable}
-                    defaultValue={variable.serverValue}
-                    placeholder={variable.defaultValue}
-                />
+                    </>
+                }
             </InputSpinner>
             <p css={tw`mt-1 text-xs text-neutral-300`}>
                 {variable.description}
diff --git a/resources/scripts/components/server/users/PermissionRow.tsx b/resources/scripts/components/server/users/PermissionRow.tsx
index 1baf6d381..2b8ceaab3 100644
--- a/resources/scripts/components/server/users/PermissionRow.tsx
+++ b/resources/scripts/components/server/users/PermissionRow.tsx
@@ -1,8 +1,48 @@
 import tw, { styled } from 'twin.macro';
-import Checkbox from '@/components/elements/Checkbox';
 import React from 'react';
 import { useStoreState } from 'easy-peasy';
 import Label from '@/components/elements/Label';
+import { Field, FieldProps } from 'formik';
+import Input from '@/components/elements/Input';
+
+interface CheckboxProps {
+    name: string;
+    value: string;
+    className?: string;
+}
+
+type CheckboxOmitFields = 'ref' | 'name' | 'value' | 'type' | 'checked' | 'onClick' | 'onChange';
+
+type InputProps = Omit<JSX.IntrinsicElements['input'], CheckboxOmitFields> & CheckboxProps;
+
+const Checkbox = ({ name, value, className, ...props }: InputProps) => (
+    <Field name={name}>
+        {({ field, form }: FieldProps) => {
+            if (!Array.isArray(field.value)) {
+                console.error('Attempting to mount a checkbox using a field value that is not an array.');
+                return null;
+            }
+
+            return (
+                <Input
+                    {...field}
+                    {...props}
+                    className={className}
+                    type={'checkbox'}
+                    checked={(field.value || []).includes(value)}
+                    onClick={() => form.setFieldTouched(field.name, true)}
+                    onChange={e => {
+                        const set = new Set(field.value);
+                        set.has(value) ? set.delete(value) : set.add(value);
+
+                        field.onChange(e);
+                        form.setFieldValue(field.name, Array.from(set));
+                    }}
+                />
+            );
+        }}
+    </Field>
+);
 
 const Container = styled.label`
   ${tw`flex items-center border border-transparent rounded md:p-2 transition-colors duration-75`};
diff --git a/resources/scripts/helpers.ts b/resources/scripts/helpers.ts
index 8ad4e2958..cd57c55b6 100644
--- a/resources/scripts/helpers.ts
+++ b/resources/scripts/helpers.ts
@@ -63,3 +63,7 @@ export function encodePathSegments (path: string): string {
 export function hashToPath (hash: string): string {
     return hash.length > 0 ? decodeURIComponent(hash.substr(1)) : '/';
 }
+
+export function formatIp (ip: string): string {
+    return /([a-f0-9:]+:+)+[a-f0-9]+/.test(ip) ? `[${ip}]` : ip;
+}
diff --git a/resources/scripts/plugins/usePersistedState.ts b/resources/scripts/plugins/usePersistedState.ts
index 034e81e1c..b1920477f 100644
--- a/resources/scripts/plugins/usePersistedState.ts
+++ b/resources/scripts/plugins/usePersistedState.ts
@@ -1,6 +1,6 @@
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
 
-export function usePersistedState<S = undefined> (key: string, defaultValue: S): [ S | undefined, Dispatch<SetStateAction<S | undefined>> ] {
+export function usePersistedState<S extends any = undefined> (key: string, defaultValue: S): [ S, Dispatch<SetStateAction<S>> ] {
     const [ state, setState ] = useState(
         () => {
             try {
diff --git a/resources/scripts/plugins/useUserPersistedState.ts b/resources/scripts/plugins/useUserPersistedState.ts
new file mode 100644
index 000000000..7e0fe2c5a
--- /dev/null
+++ b/resources/scripts/plugins/useUserPersistedState.ts
@@ -0,0 +1,9 @@
+import { useStoreState } from 'easy-peasy';
+import { usePersistedState } from '@/plugins/usePersistedState';
+import { Dispatch, SetStateAction } from 'react';
+
+export default <S extends any = undefined>(key: string, defaultValue: S): [ S, Dispatch<SetStateAction<S>> ] => {
+    const uuid = useStoreState(state => state.user.data!.uuid);
+
+    return usePersistedState(`${uuid}:${key}`, defaultValue);
+};
diff --git a/resources/scripts/routers/AdminRouter.tsx b/resources/scripts/routers/AdminRouter.tsx
index 88e747764..0adc0f1a2 100644
--- a/resources/scripts/routers/AdminRouter.tsx
+++ b/resources/scripts/routers/AdminRouter.tsx
@@ -1,7 +1,7 @@
 import { State, useStoreState } from 'easy-peasy';
 import React from 'react';
 import { NavLink, Route, RouteComponentProps, Switch } from 'react-router-dom';
-import tw, { styled } from 'twin.macro';
+import tw from 'twin.macro';
 import OverviewContainer from '@/components/admin/overview/OverviewContainer';
 import SettingsContainer from '@/components/admin/settings/SettingsContainer';
 import DatabasesContainer from '@/components/admin/databases/DatabasesContainer';
@@ -28,249 +28,126 @@ import MountsContainer from '@/components/admin/mounts/MountsContainer';
 import NewMountContainer from '@/components/admin/mounts/NewMountContainer';
 import MountEditContainer from '@/components/admin/mounts/MountEditContainer';
 import { NotFound } from '@/components/elements/ScreenBlock';
-import { usePersistedState } from '@/plugins/usePersistedState';
 import { ApplicationStore } from '@/state';
 import { AdminContext } from '@/state/admin';
-import { breakpoint } from '@/theme';
-
-const Sidebar = styled.div<{ collapsed?: boolean }>`
-    ${tw`fixed h-screen hidden md:flex flex-col items-center flex-shrink-0 bg-neutral-900 overflow-x-hidden transition-all duration-250 ease-linear`};
-    ${props => props.collapsed ? 'width: 70px' : 'width: 287px'};
-
-    & > div.header {
-        ${tw`h-16 w-full flex flex-col items-center justify-center mt-1 mb-3 select-none cursor-pointer`};
-    }
-
-    & > div.wrapper {
-        ${tw`w-full flex flex-col px-4`};
-
-        & > span {
-            height: 18px;
-            ${tw`font-header font-medium text-xs text-neutral-300 whitespace-nowrap uppercase ml-4 mb-1 select-none`};
-            ${props => props.collapsed && tw`opacity-0`};
-
-            &:not(:first-of-type) {
-                ${tw`mt-4`};
-            }
-        }
-
-        & > a {
-            ${tw`h-10 w-full flex flex-row items-center text-neutral-300 cursor-pointer select-none`};
-            ${props => props.collapsed ? tw`justify-center` : tw`px-4`};
-
-            & > svg {
-                ${tw`h-6 w-6 flex flex-shrink-0`};
-            }
-
-            & > span {
-                ${props => props.collapsed ? tw`hidden` : tw`font-header font-medium text-lg whitespace-nowrap leading-none ml-3`};
-            }
-
-            &:hover {
-                ${tw`text-neutral-50`};
-            }
-
-            &:active, &.active {
-                ${tw`text-neutral-50 bg-neutral-800 rounded`};
-            }
-        }
-    }
-
-    & > a {
-        ${tw`h-10 w-full flex flex-row items-center text-neutral-300 cursor-pointer select-none`};
-        ${props => props.collapsed ? tw`justify-center px-4` : tw`px-8`};
-
-        & > svg {
-            ${tw`h-6 w-6 flex flex-shrink-0`};
-        }
-
-        & > span {
-            ${props => props.collapsed ? tw`hidden` : tw`font-header font-medium text-lg whitespace-nowrap leading-none ml-3`};
-        }
-
-        &:hover {
-            ${tw`text-neutral-50`};
-        }
-    }
-
-    & > div.user {
-        ${tw`h-16 w-full flex items-center bg-neutral-700 justify-center`};
-
-        & > div, a {
-            ${props => props.collapsed && tw`hidden`};
-        }
-    }
-`;
-
-const Container = styled.div<{ collapsed?: boolean }>`
-    ${tw`w-full flex flex-col items-center transition-all duration-250 ease-linear`};
-    ${props => props.collapsed ?
-        breakpoint('md')`padding-left: 70px`
-        :
-        breakpoint('md')`padding-left: 287px`};
-`;
+import {
+    CogIcon,
+    DatabaseIcon,
+    FolderIcon,
+    GlobeIcon,
+    OfficeBuildingIcon,
+    ReplyIcon,
+    ServerIcon,
+    TerminalIcon,
+    UserGroupIcon,
+    UsersIcon,
+    ViewGridIcon,
+} from '@heroicons/react/outline';
+import CollapsedIcon from '@/assets/images/pterodactyl.svg';
+import Sidebar from '@/components/admin/Sidebar';
+import useUserPersistedState from '@/plugins/useUserPersistedState';
 
 const AdminRouter = ({ location, match }: RouteComponentProps) => {
-    const user = useStoreState((state: State<ApplicationStore>) => state.user.data);
+    const email = useStoreState((state: State<ApplicationStore>) => state.user.data!.email);
+    const roleName = useStoreState((state: State<ApplicationStore>) => state.user.data!.roleName);
+    const avatarURL = useStoreState((state: State<ApplicationStore>) => state.user.data!.avatarURL);
     const applicationName = useStoreState((state: ApplicationStore) => state.settings.data!.name);
 
-    const uuid = useStoreState(state => state.user.data!.uuid);
-    const [ collapsed, setCollapsed ] = usePersistedState<boolean>(`${uuid}:admin_sidebar_collapsed`, false);
+    const [ collapsed, setCollapsed ] = useUserPersistedState('admin_sidebar_collapsed', false);
 
     return (
-        <div css={tw`h-screen w-screen overflow-x-hidden flex flex-col md:flex-row`}>
-            <Sidebar collapsed={collapsed}>
-                <div className={'header'} onClick={ () => { setCollapsed(!collapsed); } }>
-                    { !collapsed ?
+        <div css={tw`h-screen flex`}>
+            <Sidebar css={tw`flex-none`} $collapsed={collapsed}>
+                <div
+                    css={tw`h-16 w-full flex flex-col items-center justify-center mt-1 mb-3 select-none cursor-pointer`}
+                    onClick={() => setCollapsed(!collapsed)}
+                >
+                    {!collapsed ?
                         <h1 css={tw`text-2xl text-neutral-50 whitespace-nowrap font-medium`}>{applicationName}</h1>
                         :
-                        <img src={'/favicons/android-icon-48x48.png'} alt={'Pterodactyl Icon'} />
+                        <img src={CollapsedIcon} css={tw`mt-4 w-20`} alt={'Pterodactyl Icon'}/>
                     }
                 </div>
-
-                <div className={'wrapper'}>
-                    <span>Administration</span>
-
+                <Sidebar.Wrapper>
+                    <Sidebar.Section>Administration</Sidebar.Section>
                     <NavLink to={`${match.url}`} exact>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" /></svg>
-                        <span>Overview</span>
+                        <OfficeBuildingIcon/><span>Overview</span>
                     </NavLink>
                     <NavLink to={`${match.url}/settings`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" /><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /></svg>
-                        <span>Settings</span>
+                        <CogIcon/><span>Settings</span>
                     </NavLink>
-
-                    <span>Management</span>
-
+                    <Sidebar.Section>Management</Sidebar.Section>
                     <NavLink to={`${match.url}/databases`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4" /></svg>
-                        <span>Databases</span>
+                        <DatabaseIcon/><span>Databases</span>
                     </NavLink>
                     <NavLink to={`${match.url}/locations`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3.055 11H5a2 2 0 012 2v1a2 2 0 002 2 2 2 0 012 2v2.945M8 3.935V5.5A2.5 2.5 0 0010.5 8h.5a2 2 0 012 2 2 2 0 104 0 2 2 0 012-2h1.064M15 20.488V18a2 2 0 012-2h3.064M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
-                        <span>Locations</span>
+                        <GlobeIcon/><span>Locations</span>
                     </NavLink>
                     <NavLink to={`${match.url}/nodes`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-2-4h.01M17 16h.01" /></svg>
-                        <span>Nodes</span>
+                        <ServerIcon/><span>Nodes</span>
                     </NavLink>
                     <NavLink to={`${match.url}/servers`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
-                        <span>Servers</span>
+                        <TerminalIcon/><span>Servers</span>
                     </NavLink>
                     <NavLink to={`${match.url}/users`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" /></svg>
-                        <span>Users</span>
+                        <UsersIcon/><span>Users</span>
                     </NavLink>
                     <NavLink to={`${match.url}/roles`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" /></svg>
-                        <span>Roles</span>
+                        <UserGroupIcon/><span>Roles</span>
                     </NavLink>
-
-                    <span>Service Management</span>
-
+                    <Sidebar.Section>Service Management</Sidebar.Section>
                     <NavLink to={`${match.url}/nests`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2V6zM14 6a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2V6zM4 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2H6a2 2 0 01-2-2v-2zM14 16a2 2 0 012-2h2a2 2 0 012 2v2a2 2 0 01-2 2h-2a2 2 0 01-2-2v-2z" /></svg>
-                        <span>Nests</span>
+                        <ViewGridIcon/><span>Nests</span>
                     </NavLink>
                     <NavLink to={`${match.url}/mounts`}>
-                        <svg viewBox="0 0 24 24" fill="none" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" /></svg>
-                        <span>Mounts</span>
+                        <FolderIcon/><span>Mounts</span>
                     </NavLink>
-                </div>
-
+                </Sidebar.Wrapper>
                 <NavLink to={'/'} css={tw`mt-auto mb-3`}>
-                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" css={tw`h-6 w-6`}>
-                        <path strokeWidth={2} strokeLinecap="round" strokeLinejoin="round" d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6"/>
-                    </svg>
-                    <span>Return</span>
+                    <ReplyIcon/><span>Return</span>
                 </NavLink>
-
-                <div className={'user'}>
-                    <img src={user !== undefined ? user.avatarURL + '?s=64' : ''} alt="Profile Picture" css={tw`h-10 w-10 rounded-full select-none`} />
-
+                <Sidebar.User>
+                    {avatarURL &&
+                    <img src={`${avatarURL}?s=64`} alt="Profile Picture" css={tw`h-10 w-10 rounded-full select-none`}/>
+                    }
                     <div css={tw`flex flex-col ml-3`}>
-                        <span css={tw`font-sans font-normal text-sm text-neutral-50 whitespace-nowrap leading-tight select-none`}>{user?.email}</span>
-                        <span css={tw`font-header font-normal text-xs text-neutral-300 whitespace-nowrap leading-tight select-none`}>{user?.roleName}</span>
+                        <span css={tw`font-sans font-normal text-sm text-neutral-50 whitespace-nowrap leading-tight select-none`}>{email}</span>
+                        <span css={tw`font-header font-normal text-xs text-neutral-300 whitespace-nowrap leading-tight select-none`}>{roleName}</span>
                     </div>
-                </div>
+                </Sidebar.User>
             </Sidebar>
-
-            <Container collapsed={collapsed}>
-                <div css={tw`md:min-h-screen w-full flex flex-col px-6 md:px-16 pt-6 md:pt-12`} style={{ maxWidth: '86rem' }}>
-                    {/* <TransitionRouter> */}
+            <div css={tw`flex-1 overflow-x-hidden px-6 pt-6 lg:px-10 lg:pt-8 xl:px-16 xl:pt-12`}>
+                <div css={tw`w-full flex flex-col mx-auto`} style={{ maxWidth: '86rem' }}>
                     <Switch location={location}>
                         <Route path={`${match.path}`} component={OverviewContainer} exact/>
-                        <Route path={`${match.path}/settings`} component={SettingsContainer} exact/>
-
+                        <Route path={`${match.path}/settings`} component={SettingsContainer}/>
                         <Route path={`${match.path}/databases`} component={DatabasesContainer} exact/>
                         <Route path={`${match.path}/databases/new`} component={NewDatabaseContainer} exact/>
-                        <Route
-                            path={`${match.path}/databases/:id`}
-                            component={DatabaseEditContainer}
-                            exact
-                        />
-
+                        <Route path={`${match.path}/databases/:id`} component={DatabaseEditContainer} exact/>
                         <Route path={`${match.path}/locations`} component={LocationsContainer} exact/>
-                        <Route
-                            path={`${match.path}/locations/:id`}
-                            component={LocationEditContainer}
-                            exact
-                        />
-
+                        <Route path={`${match.path}/locations/:id`} component={LocationEditContainer} exact/>
                         <Route path={`${match.path}/nodes`} component={NodesContainer} exact/>
                         <Route path={`${match.path}/nodes/new`} component={NewNodeContainer} exact/>
-                        <Route
-                            path={`${match.path}/nodes/:id`}
-                            component={NodeRouter}
-                        />
-
+                        <Route path={`${match.path}/nodes/:id`} component={NodeRouter}/>
                         <Route path={`${match.path}/servers`} component={ServersContainer} exact/>
                         <Route path={`${match.path}/servers/new`} component={NewServerContainer} exact/>
-                        <Route
-                            path={`${match.path}/servers/:id`}
-                            component={ServerRouter}
-                        />
-
+                        <Route path={`${match.path}/servers/:id`} component={ServerRouter}/>
                         <Route path={`${match.path}/users`} component={UsersContainer} exact/>
                         <Route path={`${match.path}/users/new`} component={NewUserContainer} exact/>
-                        <Route
-                            path={`${match.path}/users/:id`}
-                            component={UserRouter}
-                        />
-
+                        <Route path={`${match.path}/users/:id`} component={UserRouter}/>
                         <Route path={`${match.path}/roles`} component={RolesContainer} exact/>
-                        <Route
-                            path={`${match.path}/roles/:id`}
-                            component={RoleEditContainer}
-                            exact
-                        />
-
+                        <Route path={`${match.path}/roles/:id`} component={RoleEditContainer} exact/>
                         <Route path={`${match.path}/nests`} component={NestsContainer} exact/>
-                        <Route
-                            path={`${match.path}/nests/:nestId`}
-                            component={NestEditContainer}
-                            exact
-                        />
+                        <Route path={`${match.path}/nests/:nestId`} component={NestEditContainer} exact/>
                         <Route path={`${match.path}/nests/:nestId/new`} component={NewEggContainer} exact/>
-                        <Route
-                            path={`${match.path}/nests/:nestId/eggs/:id`}
-                            component={EggRouter}
-                        />
-
+                        <Route path={`${match.path}/nests/:nestId/eggs/:id`} component={EggRouter}/>
                         <Route path={`${match.path}/mounts`} component={MountsContainer} exact/>
                         <Route path={`${match.path}/mounts/new`} component={NewMountContainer} exact/>
-                        <Route
-                            path={`${match.path}/mounts/:id`}
-                            component={MountEditContainer}
-                            exact
-                        />
-
+                        <Route path={`${match.path}/mounts/:id`} component={MountEditContainer} exact/>
                         <Route path={'*'} component={NotFound}/>
                     </Switch>
-                    {/* </TransitionRouter> */}
                 </div>
-            </Container>
+            </div>
         </div>
     );
 };
diff --git a/resources/scripts/state/flashes.ts b/resources/scripts/state/flashes.ts
index 03374cdee..f888d07d6 100644
--- a/resources/scripts/state/flashes.ts
+++ b/resources/scripts/state/flashes.ts
@@ -30,6 +30,8 @@ const flashes: FlashStore = {
     }),
 
     clearAndAddHttpError: action((state, payload) => {
+        console.error(payload.error);
+
         state.items = [ { type: 'error', title: 'Error', key: payload.key, message: httpErrorToHuman(payload.error) } ];
     }),
 
diff --git a/resources/scripts/theme.ts b/resources/scripts/theme.ts
index 9dd0b467d..8679ebaa7 100644
--- a/resources/scripts/theme.ts
+++ b/resources/scripts/theme.ts
@@ -3,8 +3,8 @@ import { BreakpointFunction, createBreakpoint } from 'styled-components-breakpoi
 type Breakpoints = 'xs' | 'sm' | 'md' | 'lg' | 'xl';
 export const breakpoint: BreakpointFunction<Breakpoints> = createBreakpoint<Breakpoints>({
     xs: 0,
-    sm: 576,
+    sm: 640,
     md: 768,
-    lg: 992,
-    xl: 1200,
+    lg: 1024,
+    xl: 1280,
 });
diff --git a/routes/api-application.php b/routes/api-application.php
index d9000f59f..dceb9a4cc 100644
--- a/routes/api-application.php
+++ b/routes/api-application.php
@@ -33,12 +33,16 @@ Route::group(['prefix' => '/databases'], function () {
 */
 Route::group(['prefix' => '/eggs'], function () {
     Route::get('/{egg}', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggController::class, 'view']);
+    Route::get('/{egg}/export', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggController::class, 'export']);
 
     Route::post('/', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggController::class, 'store']);
+    Route::post('/{egg}/variables', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggVariableController::class, 'store']);
 
     Route::patch('/{egg}', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggController::class, 'update']);
+    Route::patch('/{egg}/variables', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggVariableController::class, 'update']);
 
     Route::delete('/{egg}', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggController::class, 'delete']);
+    Route::delete('/{egg}/variables/{eggVariable}', [\Pterodactyl\Http\Controllers\Api\Application\Eggs\EggVariableController::class, 'delete']);
 });
 
 /*
diff --git a/routes/auth.php b/routes/auth.php
index d16089ef8..5e561603c 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -1,7 +1,5 @@
 <?php
 
-use Illuminate\Support\Facades\Route;
-
 /*
 |--------------------------------------------------------------------------
 | Authentication Routes
@@ -17,13 +15,22 @@ Route::group(['middleware' => 'guest'], function () {
     Route::get('/password', 'LoginController@index')->name('auth.forgot-password');
     Route::get('/password/reset/{token}', 'LoginController@index')->name('auth.reset');
 
-    // Login endpoints.
-    Route::post('/login', 'LoginController@login')->middleware('recaptcha');
-    Route::post('/login/checkpoint', 'LoginCheckpointController')->name('auth.login-checkpoint');
+    // Apply a throttle to authentication action endpoints, in addition to the
+    // recaptcha endpoints to slow down manual attack spammers even more. 🤷‍
+    //
+    // @see \Pterodactyl\Providers\RouteServiceProvider
+    Route::middleware(['throttle:authentication'])->group(function () {
+        // Login endpoints.
+        Route::post('/login', 'LoginController@login')->middleware('recaptcha');
+        Route::post('/login/checkpoint', 'LoginCheckpointController')->name('auth.login-checkpoint');
+        Route::post('/login/checkpoint/key', 'WebauthnController@auth')->name('auth.login-checkpoint-key');
 
-    // Forgot password route. A post to this endpoint will trigger an
-    // email to be sent containing a reset token.
-    Route::post('/password', 'ForgotPasswordController@sendResetLinkEmail')->middleware('recaptcha');
+        // Forgot password route. A post to this endpoint will trigger an
+        // email to be sent containing a reset token.
+        Route::post('/password', 'ForgotPasswordController@sendResetLinkEmail')
+            ->name('auth.post.forgot-password')
+            ->middleware('recaptcha');
+    });
 
     // Password reset routes. This endpoint is hit after going through
     // the forgot password routes to acquire a token (or after an account
@@ -42,4 +49,4 @@ Route::group(['middleware' => 'guest'], function () {
 | Endpoint: /auth
 |
 */
-Route::get('/logout', 'LoginController@logout')->name('auth.logout')->middleware('auth');
+Route::post('/logout', 'LoginController@logout')->name('auth.logout')->middleware('auth', 'csrf');
diff --git a/tests/Integration/Api/Application/Eggs/EggControllerTest.php b/tests/Integration/Api/Application/Eggs/EggControllerTest.php
index 05608a831..58755545c 100644
--- a/tests/Integration/Api/Application/Eggs/EggControllerTest.php
+++ b/tests/Integration/Api/Application/Eggs/EggControllerTest.php
@@ -23,7 +23,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
     }
 
     /**
-     * Test that all of the eggs belonging to a given nest can be returned.
+     * Test that all the eggs belonging to a given nest can be returned.
      */
     public function testListAllEggsInNest()
     {
@@ -44,7 +44,6 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
                             'files' => [],
                             'startup' => ['done'],
                             'stop',
-                            'logs' => ['custom', 'location'],
                             'extends',
                         ],
                     ],
@@ -58,7 +57,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
             $expected = json_encode(Arr::sortRecursive($datum['attributes']));
             $actual = json_encode(Arr::sortRecursive((new EggTransformer())->transform($egg)));
 
-            $this->assertSame(
+            $this->assertJsonStringEqualsJsonString(
                 $expected,
                 $actual,
                 'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL . "[{$expected}]" . PHP_EOL . PHP_EOL . 'within' . PHP_EOL . PHP_EOL . "[{$actual}]."
@@ -84,12 +83,12 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
 
         $response->assertJson([
             'object' => 'egg',
-            'attributes' => (new EggTransformer())->transform($egg),
+            'attributes' => json_decode(json_encode((new EggTransformer())->transform($egg)), true),
         ], true);
     }
 
     /**
-     * Test that a single egg and all of the defined relationships can be returned.
+     * Test that a single egg and all the defined relationships can be returned.
      */
     public function testReturnSingleEggWithRelationships()
     {
diff --git a/tests/Integration/Api/Application/Location/LocationControllerTest.php b/tests/Integration/Api/Application/Location/LocationControllerTest.php
index 9dd7e0d88..0ce70be97 100644
--- a/tests/Integration/Api/Application/Location/LocationControllerTest.php
+++ b/tests/Integration/Api/Application/Location/LocationControllerTest.php
@@ -2,9 +2,9 @@
 
 namespace Pterodactyl\Tests\Integration\Api\Application\Location;
 
-use Pterodactyl\Models\Node;
 use Illuminate\Http\Response;
 use Pterodactyl\Models\Location;
+use Pterodactyl\Transformers\Api\Application\LocationTransformer;
 use Pterodactyl\Transformers\Api\Application\NodeTransformer;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
 use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
@@ -89,6 +89,77 @@ class LocationControllerTest extends ApplicationApiIntegrationTestCase
         ], true);
     }
 
+    /**
+     * Test that a location can be created.
+     */
+    public function testCreateLocation()
+    {
+        $response = $this->postJson('/api/application/locations', [
+            'short' => 'inhouse',
+            'long' => 'This is my inhouse location',
+        ]);
+
+        $response->assertStatus(Response::HTTP_CREATED);
+        $response->assertJsonCount(3);
+        $response->assertJsonStructure([
+            'object',
+            'attributes' => ['id', 'short', 'long', 'created_at', 'updated_at'],
+            'meta' => ['resource'],
+        ]);
+
+        $this->assertDatabaseHas('locations', ['short' => 'inhouse', 'long' => 'This is my inhouse location']);
+
+        $location = Location::where('short', 'inhouse')->first();
+        $response->assertJson([
+            'object' => 'location',
+            'attributes' => $this->getTransformer(LocationTransformer::class)->transform($location),
+            'meta' => [
+                'resource' => route('api.application.locations.view', $location->id),
+            ],
+        ], true);
+    }
+
+    /**
+     * Test that a location can be updated.
+     */
+    public function testUpdateLocation()
+    {
+        $location = Location::factory()->create();
+
+        $response = $this->patchJson('/api/application/locations/' . $location->id, [
+            'short' => 'new inhouse',
+            'long' => 'This is my new inhouse location'
+        ]);
+        $response->assertStatus(Response::HTTP_OK);
+        $response->assertJsonCount(2);
+        $response->assertJsonStructure([
+            'object',
+            'attributes' => ['id', 'short', 'long', 'created_at', 'updated_at']
+        ]);
+
+        $this->assertDatabaseHas('locations', ['short' => 'new inhouse', 'long' => 'This is my new inhouse location']);
+        $location = $location->fresh();
+
+        $response->assertJson([
+            'object' => 'location',
+            'attributes' => $this->getTransformer(LocationTransformer::class)->transform($location),
+        ]);
+    }
+
+    /**
+     * Test that a location can be deleted from the database.
+     */
+    public function testDeleteLocation()
+    {
+        $location = Location::factory()->create();
+        $this->assertDatabaseHas('locations', ['id' => $location->id]);
+
+        $response = $this->delete('/api/application/locations/' . $location->id);
+        $response->assertStatus(Response::HTTP_NO_CONTENT);
+
+        $this->assertDatabaseMissing('locations', ['id' => $location->id]);
+    }
+
     /**
      * Test that all of the defined relationships for a location can be loaded successfully.
      */
diff --git a/tests/Integration/Api/Application/Users/UserControllerTest.php b/tests/Integration/Api/Application/Users/UserControllerTest.php
index e2dbe97d4..456a5fbe0 100644
--- a/tests/Integration/Api/Application/Users/UserControllerTest.php
+++ b/tests/Integration/Api/Application/Users/UserControllerTest.php
@@ -4,7 +4,6 @@ namespace Pterodactyl\Tests\Integration\Api\Application\Users;
 
 use Pterodactyl\Models\User;
 use Illuminate\Http\Response;
-use Pterodactyl\Services\Acl\Api\AdminAcl;
 use Pterodactyl\Transformers\Api\Application\UserTransformer;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
 use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
@@ -194,11 +193,10 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
         ]);
 
         $response->assertStatus(Response::HTTP_CREATED);
-        $response->assertJsonCount(3);
+        $response->assertJsonCount(2);
         $response->assertJsonStructure([
             'object',
             'attributes' => ['id', 'external_id', 'uuid', 'username', 'email', 'language', 'admin_role_id', 'root_admin', '2fa', 'created_at', 'updated_at'],
-            'meta' => ['resource'],
         ]);
 
         $this->assertDatabaseHas('users', ['username' => 'testuser', 'email' => 'test@example.com']);
@@ -207,9 +205,6 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
         $response->assertJson([
             'object' => 'user',
             'attributes' => (new UserTransformer())->transform($user),
-            'meta' => [
-                'resource' => route('api.application.users.view', $user->id),
-            ],
         ], true);
     }
 
diff --git a/webpack.config.js b/webpack.config.js
index 56c1ff1c5..40deffd22 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = {
         path: path.join(__dirname, '/public/assets'),
         filename: isProduction ? 'bundle.[chunkhash:8].js' : 'bundle.[hash:8].js',
         chunkFilename: isProduction ? '[name].[chunkhash:8].js' : '[name].[hash:8].js',
-        publicPath: (process.env.PUBLIC_PATH || '') + '/assets/',
+        publicPath: (process.env.WEBPACK_PUBLIC_PATH || '/assets/'),
         crossOriginLoading: 'anonymous',
     },
     module: {
@@ -60,7 +60,7 @@ module.exports = {
         extensions: ['.ts', '.tsx', '.js', '.json'],
         alias: {
             '@': path.join(__dirname, '/resources/scripts'),
-            'feature': path.join(__dirname, '/resources/scripts/components/server/features'),
+            '@feature': path.join(__dirname, '/resources/scripts/components/server/features'),
             'react-dom': '@hot-loader/react-dom',
         },
         symlinks: false,
@@ -116,7 +116,7 @@ module.exports = {
     devServer: {
         compress: true,
         contentBase: path.join(__dirname, '/public'),
-        publicPath: (process.env.PUBLIC_PATH || '') + '/assets/',
+        publicPath: process.env.WEBPACK_PUBLIC_PATH || '/assets/',
         allowedHosts: [
             '.pterodactyl.test',
         ],
diff --git a/yarn.lock b/yarn.lock
index 4293c74a9..86467635c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,12 +5,6 @@ __metadata:
   version: 4
   cacheKey: 8
 
-"@@link:./resources/scripts::locator=pterodactyl-panel%40workspace%3A.":
-  version: 0.0.0-use.local
-  resolution: "@@link:./resources/scripts::locator=pterodactyl-panel%40workspace%3A."
-  languageName: node
-  linkType: soft
-
 "@babel/code-frame@npm:7.12.11":
   version: 7.12.11
   resolution: "@babel/code-frame@npm:7.12.11"
@@ -47,33 +41,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.14.5, @babel/compat-data@npm:^7.14.7":
+"@babel/code-frame@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/code-frame@npm:7.16.0"
+  dependencies:
+    "@babel/highlight": ^7.16.0
+  checksum: 8961d0302ec6b8c2e9751a11e06a17617425359fd1645e4dae56a90a03464c68a0916115100fbcd030961870313f21865d0b85858360a2c68aabdda744393607
+  languageName: node
+  linkType: hard
+
+"@babel/compat-data@npm:^7.13.11, @babel/compat-data@npm:^7.14.5":
   version: 7.14.7
   resolution: "@babel/compat-data@npm:7.14.7"
   checksum: dcf7a72cb650206857a98cce1ab0973e67689f19afc3b30cabff6dbddf563f188d54d3b3f92a70c6bc1feb9049d8b2e601540e1d435b6866c77bffad0a441c9f
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.14.6, @babel/core@npm:^7.14.5":
-  version: 7.14.6
-  resolution: "@babel/core@npm:7.14.6"
+"@babel/compat-data@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/compat-data@npm:7.16.0"
+  checksum: 2befa4ba145e3acdce3e160dcad0917a073f12d238bde295c37676e7a1d164630848926034df2dfde244cef6a190b25350ffac0b4215c37123787f67aea80e71
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:7.16.0, @babel/core@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/core@npm:7.16.0"
   dependencies:
-    "@babel/code-frame": ^7.14.5
-    "@babel/generator": ^7.14.5
-    "@babel/helper-compilation-targets": ^7.14.5
-    "@babel/helper-module-transforms": ^7.14.5
-    "@babel/helpers": ^7.14.6
-    "@babel/parser": ^7.14.6
-    "@babel/template": ^7.14.5
-    "@babel/traverse": ^7.14.5
-    "@babel/types": ^7.14.5
+    "@babel/code-frame": ^7.16.0
+    "@babel/generator": ^7.16.0
+    "@babel/helper-compilation-targets": ^7.16.0
+    "@babel/helper-module-transforms": ^7.16.0
+    "@babel/helpers": ^7.16.0
+    "@babel/parser": ^7.16.0
+    "@babel/template": ^7.16.0
+    "@babel/traverse": ^7.16.0
+    "@babel/types": ^7.16.0
     convert-source-map: ^1.7.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.1.2
     semver: ^6.3.0
     source-map: ^0.5.0
-  checksum: 6ede604d8de7a103c087b96a58548a3d27efb9e53de6ecc84f4b4ca947cd91f02b0289fc04557b04eb6e31243dbeabdcdb8fd520a1780f284333f56eb1b58913
+  checksum: a140f669daa90c774016a76b1f85641975333c1c219ae0a8e65d8b4c316836e918276e0dfd55613b14f8e578406a92393d4368a63bdd5d0708122976ee2ee8e3
   languageName: node
   linkType: hard
 
@@ -100,6 +110,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/generator@npm:7.16.0"
+  dependencies:
+    "@babel/types": ^7.16.0
+    jsesc: ^2.5.1
+    source-map: ^0.5.0
+  checksum: 9ff53e0db72a225c8783c4a277698b4efcead750542ebb9cff31732ba62d092090715a772df10a323446924712f6928ad60c03db4e7051bed3a9701b552d51fb
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.0.0":
   version: 7.7.4
   resolution: "@babel/helper-annotate-as-pure@npm:7.7.4"
@@ -118,26 +139,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-annotate-as-pure@npm:7.14.5"
+"@babel/helper-annotate-as-pure@npm:^7.15.4, @babel/helper-annotate-as-pure@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-annotate-as-pure@npm:7.16.0"
   dependencies:
-    "@babel/types": ^7.14.5
-  checksum: 18cefedda60003c2551dabe0e4ad278ef0507682680892c60e9f7cb75ae1dc9a065cddb3ce9964da76f220bf972af5262619eeac4b84c2b8aba1b031961215cc
+    "@babel/types": ^7.16.0
+  checksum: 0db76106983e10ffc482c5f01e89c3b4687d2474bea69c44470b2acb6bd37f362f9057d6e69c617255390b5d0063d9932a931e83c3e130445b688ca1fcdb5bcd
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.14.5"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.0"
   dependencies:
-    "@babel/helper-explode-assignable-expression": ^7.14.5
-    "@babel/types": ^7.14.5
-  checksum: 0d3571edff0a96d625503a3fd79643f66f8a5204e75c4351276c0d194240e1debe322a70ef9ff47952bd77ac76792f42d732922b00b5bd8b6e2c99909dc4f49b
+    "@babel/helper-explode-assignable-expression": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: 01beb9f3f2285b7b170cc167ec79b2fd657202cb25be9cb111951f94a04c97c5b446dd1498ede32f0052d67fc9f2f2ac2b7862351b364fe94f9b4de98488d863
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.13.0, @babel/helper-compilation-targets@npm:^7.14.5":
+"@babel/helper-compilation-targets@npm:^7.13.0":
   version: 7.14.5
   resolution: "@babel/helper-compilation-targets@npm:7.14.5"
   dependencies:
@@ -151,19 +172,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.14.5, @babel/helper-create-class-features-plugin@npm:^7.14.6":
-  version: 7.14.6
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.14.6"
+"@babel/helper-compilation-targets@npm:^7.16.0":
+  version: 7.16.3
+  resolution: "@babel/helper-compilation-targets@npm:7.16.3"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
-    "@babel/helper-function-name": ^7.14.5
-    "@babel/helper-member-expression-to-functions": ^7.14.5
-    "@babel/helper-optimise-call-expression": ^7.14.5
-    "@babel/helper-replace-supers": ^7.14.5
-    "@babel/helper-split-export-declaration": ^7.14.5
+    "@babel/compat-data": ^7.16.0
+    "@babel/helper-validator-option": ^7.14.5
+    browserslist: ^4.17.5
+    semver: ^6.3.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 9d9c3c6f469bc5da4e5819979d0f70bf8a824967661743800741b5560cfa3cf811d52ab14dc00dd6e839814f8db39cf3118c08d550c487680969c40c9ccf2e2a
+  checksum: 038bcd43ac914371c51bf6e72b5cedcae432f0d359285d74a9133c6a839bd625a7d5412d7471d50aa78a3e1c79b0a692b50a8d6a1299ebf69733b512ff199323
+  languageName: node
+  linkType: hard
+
+"@babel/helper-create-class-features-plugin@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.16.0"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.16.0
+    "@babel/helper-function-name": ^7.16.0
+    "@babel/helper-member-expression-to-functions": ^7.16.0
+    "@babel/helper-optimise-call-expression": ^7.16.0
+    "@babel/helper-replace-supers": ^7.16.0
+    "@babel/helper-split-export-declaration": ^7.16.0
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 0f7d1b8d413e5fbd719c95e22e3b59749b4c6c652f20e0fa1fa954112145a134c22709f1325574632d7262aeeeaaf4fc7c2eb8117e0d521e42b36d05c3e5a885
   languageName: node
   linkType: hard
 
@@ -180,21 +215,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.14.5"
+"@babel/helper-create-regexp-features-plugin@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.16.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
+    "@babel/helper-annotate-as-pure": ^7.16.0
     regexpu-core: ^4.7.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: c2636d0a6ea6d57eb3603ba9b223fd6ec273a3d8171eb8d84a357ff028cd747ab383b1d7cef84a4df5f9aebb321d43599895f562f3c8aa96314d4847aa59710e
+  checksum: d6230477e1997ed1fa0aee9ab34d3ce96400e0df25101879fdaf90ea613adec68ec06a609d8c78787c02a6275ef5a7403a38aa8fd42fef1a4d27bcfe577c81d6
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.2.2":
-  version: 0.2.3
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.2.3"
+"@babel/helper-define-polyfill-provider@npm:^0.2.4":
+  version: 0.2.4
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.2.4"
   dependencies:
     "@babel/helper-compilation-targets": ^7.13.0
     "@babel/helper-module-imports": ^7.12.13
@@ -206,16 +241,16 @@ __metadata:
     semver: ^6.1.2
   peerDependencies:
     "@babel/core": ^7.4.0-0
-  checksum: 797699fe870e45bdbc7c4128963427f7d6240609b700b3f2c0a2f2f187e5f848ba704bcfe58d7d91796cabc5001fae01746b3efda113beb5b5b824927cf59fdb
+  checksum: 0b81df2fe8d4e7af1f0ed0f9c83bdb0fc1978e2cb2d4b5421dad7ee4afda79044d61de5b06026164ef52ee1afa59a15ee99bc7e532ad2b8a4bbe4341d3fa6b05
   languageName: node
   linkType: hard
 
-"@babel/helper-explode-assignable-expression@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-explode-assignable-expression@npm:7.14.5"
+"@babel/helper-explode-assignable-expression@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-explode-assignable-expression@npm:7.16.0"
   dependencies:
-    "@babel/types": ^7.14.5
-  checksum: f3b34c54ad26e48e1409f21aaac8ee5b5fa3bd2917ce4df496f57daec12b6132b2d5c2618da807458e97bc2d7894c5bf505cc96789e0c289dcc9948d7844bb03
+    "@babel/types": ^7.16.0
+  checksum: 563352b5e9b0b9584187176723ea65ea6ac9348d612c2bdc76701634eae445fd05d18f7b7555f5c6bbe4ec4d9d30172633a56bf4cfbb1333b798f58444057652
   languageName: node
   linkType: hard
 
@@ -241,6 +276,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-function-name@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-function-name@npm:7.16.0"
+  dependencies:
+    "@babel/helper-get-function-arity": ^7.16.0
+    "@babel/template": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: 8c02371d28678f3bb492e69d4635b2fe6b1c5a93ce129bf883f1fafde2005f4dbc0e643f52103ca558b698c0774bfb84a93f188d71db1c077f754b6220629b92
+  languageName: node
+  linkType: hard
+
 "@babel/helper-get-function-arity@npm:^7.10.4":
   version: 7.10.4
   resolution: "@babel/helper-get-function-arity@npm:7.10.4"
@@ -259,6 +305,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-get-function-arity@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-get-function-arity@npm:7.16.0"
+  dependencies:
+    "@babel/types": ^7.16.0
+  checksum: 1a68322c7b5fdffb1b51df32f7a53b1ff2268b5b99d698f0a1a426dcb355482a44ef3dae982a507907ba975314638dabb6d77ac1778098bdbe99707e6c29cae8
+  languageName: node
+  linkType: hard
+
 "@babel/helper-hoist-variables@npm:^7.14.5":
   version: 7.14.5
   resolution: "@babel/helper-hoist-variables@npm:7.14.5"
@@ -268,12 +323,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.14.5":
-  version: 7.14.7
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.14.7"
+"@babel/helper-hoist-variables@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-hoist-variables@npm:7.16.0"
   dependencies:
-    "@babel/types": ^7.14.5
-  checksum: 1768b849224002d7a8553226ad73e1e957fb6184b68234d5df7a45cf8e4453ed1208967c1cace1a4d973b223ddc881d105e372945ec688f09485dff0e8ed6180
+    "@babel/types": ^7.16.0
+  checksum: 2ee5b400c267c209a53c90eea406a8f09c30d4d7a2b13e304289d858a2e34a99272c062cfad6dad63705662943951c42ff20042ef539b2d3c4f8743183a28954
+  languageName: node
+  linkType: hard
+
+"@babel/helper-member-expression-to-functions@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.16.0"
+  dependencies:
+    "@babel/types": ^7.16.0
+  checksum: 58ef8e3a4af0c1dc43a2011f43f25502877ac1c5aa9a4a6586f0265ab857b65831f60560044bc9380df43c91ac21cad39a84095b91764b433d1acf18d27e38d6
   languageName: node
   linkType: hard
 
@@ -286,7 +350,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.12.13, @babel/helper-module-imports@npm:^7.14.5":
+"@babel/helper-module-imports@npm:^7.12.13":
   version: 7.14.5
   resolution: "@babel/helper-module-imports@npm:7.14.5"
   dependencies:
@@ -295,28 +359,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-module-transforms@npm:7.14.5"
+"@babel/helper-module-imports@npm:^7.15.4, @babel/helper-module-imports@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-module-imports@npm:7.16.0"
   dependencies:
-    "@babel/helper-module-imports": ^7.14.5
-    "@babel/helper-replace-supers": ^7.14.5
-    "@babel/helper-simple-access": ^7.14.5
-    "@babel/helper-split-export-declaration": ^7.14.5
-    "@babel/helper-validator-identifier": ^7.14.5
-    "@babel/template": ^7.14.5
-    "@babel/traverse": ^7.14.5
-    "@babel/types": ^7.14.5
-  checksum: f5d64c0242ec8949ee09069a634d28ae750ab22f9533ea90eab9eaf3405032a33b0b329a63fac0a7901482efb8a388a06279f7544225a0bc3c1b92b306ab2b6e
+    "@babel/types": ^7.16.0
+  checksum: 8e1eb9ac39440e52080b87c78d8d318e7c93658bdd0f3ce0019c908de88cbddafdc241f392898c0b0ba81fc52c8c6d2f9cc1b163ac5ed2a474d49b11646b7516
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-optimise-call-expression@npm:7.14.5"
+"@babel/helper-module-transforms@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-module-transforms@npm:7.16.0"
   dependencies:
-    "@babel/types": ^7.14.5
-  checksum: c7af558c63eb5449bf2249f1236d892ed54a400cb6c721756cde573b996c12c64dee6b57fa18ad1a0025d152e6f689444f7ea32997a1d56e1af66c3eda18843d
+    "@babel/helper-module-imports": ^7.16.0
+    "@babel/helper-replace-supers": ^7.16.0
+    "@babel/helper-simple-access": ^7.16.0
+    "@babel/helper-split-export-declaration": ^7.16.0
+    "@babel/helper-validator-identifier": ^7.15.7
+    "@babel/template": ^7.16.0
+    "@babel/traverse": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: a3d0e5556f26ebdf2ae422af3b9a1ba1848fead891f46bcd1c6a4be88ad8e9f348140f81d1843a3481574be1643a9c79b01469231f5b5801f5d5e691efdd11f3
+  languageName: node
+  linkType: hard
+
+"@babel/helper-optimise-call-expression@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-optimise-call-expression@npm:7.16.0"
+  dependencies:
+    "@babel/types": ^7.16.0
+  checksum: 121ae6054fcec76ed2c4dd83f0281b901c1e3cfac1bbff79adc3667983903ad1030a0ad9a8bea58e52b225e13881cf316f371c65276976e7a6762758a98be8f6
   languageName: node
   linkType: hard
 
@@ -357,44 +430,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.14.5"
+"@babel/helper-remap-async-to-generator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.16.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
-    "@babel/helper-wrap-function": ^7.14.5
-    "@babel/types": ^7.14.5
-  checksum: 022594a15caed0d3bbac52e27eef0f20f9dceb85921b682df55f3bb21dee6fea645b03663e84fdfaadc6b88f4b83b012858520813c15e88728bbc5e16bf3fa29
+    "@babel/helper-annotate-as-pure": ^7.16.0
+    "@babel/helper-wrap-function": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: e44690e6e8d7e2dc24f1e2a25cfba4148de1831820f15007129a8f80efa27a0133abfbd03dec8857834766ccda30be66bc1a58aef2c7cae55e2e9cfc9089bbe6
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-replace-supers@npm:7.14.5"
+"@babel/helper-replace-supers@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-replace-supers@npm:7.16.0"
   dependencies:
-    "@babel/helper-member-expression-to-functions": ^7.14.5
-    "@babel/helper-optimise-call-expression": ^7.14.5
-    "@babel/traverse": ^7.14.5
-    "@babel/types": ^7.14.5
-  checksum: 35d33cfe473f9fb5cc1110ee259686179ecd07e00e07d9eb03de998e47f49d59fc2e183cf6be0793fd6bec24510b893415e52ace93ae940f94663c4a02c6fbd0
+    "@babel/helper-member-expression-to-functions": ^7.16.0
+    "@babel/helper-optimise-call-expression": ^7.16.0
+    "@babel/traverse": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: 61f04bbe05ff0987d5a8d5253cb101d47004a27951d6c5cd95457e30fcb3adaca85f0bcaa7f31f4d934f22386b935ac7281398c68982d4a4768769d95c028460
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-simple-access@npm:7.14.5"
+"@babel/helper-simple-access@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-simple-access@npm:7.16.0"
   dependencies:
-    "@babel/types": ^7.14.5
-  checksum: cd795416bd10dd2f1bdebb36f1af08bf263024fdbf789cfda5dd1fbf4fea1fd0375e21d0bcb910a7d49b09b7480340797dcdfc888fbc895aeae45c145358ad75
+    "@babel/types": ^7.16.0
+  checksum: 2d7155f318411788b42d2f4a3d406de12952ad620d0bd411a0f3b5803389692ad61d9e7fab5f93b23ad3d8a09db4a75ca9722b9873a606470f468bc301944af6
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.14.5"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.16.0"
   dependencies:
-    "@babel/types": ^7.14.5
-  checksum: d16937eb08d57d2577902fa6d05ac4b1695602babd9dff9890fa8e56b593fdc997ad24de13fdaf15617036bfacf3493ea569898a5ac0538c2a831aa163f18985
+    "@babel/types": ^7.16.0
+  checksum: b9ed2896eb253e6a85f472b0d4098ed80403758ad1a4e34b02b11e8276e3083297526758b1a3e6886e292987266f10622d7dbced3508cc22b296a74903b41cfb
   languageName: node
   linkType: hard
 
@@ -416,6 +489,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-split-export-declaration@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-split-export-declaration@npm:7.16.0"
+  dependencies:
+    "@babel/types": ^7.16.0
+  checksum: 8bd87b5ea2046b145f0f55bc75cbdb6df69eaeb32919ee3c1c758757025aebca03e567a4d48389eb4f16a55021adb6ed8fa58aa771e164b15fa5e0a0722f771d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.10.4":
   version: 7.10.4
   resolution: "@babel/helper-validator-identifier@npm:7.10.4"
@@ -430,6 +512,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.15.7":
+  version: 7.15.7
+  resolution: "@babel/helper-validator-identifier@npm:7.15.7"
+  checksum: f041c28c531d1add5cc345b25d5df3c29c62bce3205b4d4a93dcd164ccf630350acba252d374fad8f5d8ea526995a215829f27183ba7ce7ce141843bf23068a6
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.14.5":
   version: 7.14.5
   resolution: "@babel/helper-validator-option@npm:7.14.5"
@@ -437,26 +526,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/helper-wrap-function@npm:7.14.5"
+"@babel/helper-wrap-function@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/helper-wrap-function@npm:7.16.0"
   dependencies:
-    "@babel/helper-function-name": ^7.14.5
-    "@babel/template": ^7.14.5
-    "@babel/traverse": ^7.14.5
-    "@babel/types": ^7.14.5
-  checksum: d5c4bec02396f00d305ae2b60cfa5f3ec27d196a71b88107745b6be4fe257ebe54deedb6ee3997c8c9a2cc5c2571d567c22e9b866109490a2aa7f79a1a2272e2
+    "@babel/helper-function-name": ^7.16.0
+    "@babel/template": ^7.16.0
+    "@babel/traverse": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: 2bb4e05f49cf217cc5890581284a051245ba0ddaccbe3ddd662010d7a6969f52d2027e310d26db2e030273c5fe9341448c7845fcb4795ad8eb56bdeabec148b8
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.14.6":
-  version: 7.14.6
-  resolution: "@babel/helpers@npm:7.14.6"
+"@babel/helpers@npm:^7.16.0":
+  version: 7.16.3
+  resolution: "@babel/helpers@npm:7.16.3"
   dependencies:
-    "@babel/template": ^7.14.5
-    "@babel/traverse": ^7.14.5
-    "@babel/types": ^7.14.5
-  checksum: fe4e73975b062a8b8b95f499f4ac1064c9a53d4ee83cc273c2420250f6a46b59f1f5e35050d41ebe04efd7885a28ceea6f4f16d8eb091e24622f2a4a5eb20f23
+    "@babel/template": ^7.16.0
+    "@babel/traverse": ^7.16.3
+    "@babel/types": ^7.16.0
+  checksum: b725b1aab734e9e1407247ee499880583855843fa2855377a2c26277bd9fbd7080219109189bc69b18d71cc30759666bfe66d534729b41452097866d1f5a66ef
   languageName: node
   linkType: hard
 
@@ -493,6 +582,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/highlight@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/highlight@npm:7.16.0"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.15.7
+    chalk: ^2.0.0
+    js-tokens: ^4.0.0
+  checksum: abf244c48fcff20ec87830e8b99c776f4dcdd9138e63decc195719a94148da35339639e0d8045eb9d1f3e67a39ab90a9c3f5ce2d579fb1a0368d911ddf29b4e5
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:^7.10.4":
   version: 7.10.4
   resolution: "@babel/parser@npm:7.10.4"
@@ -511,7 +611,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.14.5, @babel/parser@npm:^7.14.6, @babel/parser@npm:^7.14.7":
+"@babel/parser@npm:^7.14.5, @babel/parser@npm:^7.14.7":
   version: 7.14.7
   resolution: "@babel/parser@npm:7.14.7"
   bin:
@@ -520,204 +620,224 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.14.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5
-    "@babel/plugin-proposal-optional-chaining": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: 17331fd4c1de860ac78aa3195eb5bd058c4eb24a8f2c6e719f079f9c86cbdb53d9a8affc2f9f78b6fc257afef03811922c2d16addad5d5f6224d2820da1c9f45
+"@babel/parser@npm:^7.16.0, @babel/parser@npm:^7.16.3":
+  version: 7.16.3
+  resolution: "@babel/parser@npm:7.16.3"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 486b676b9d47d10de72598f9453eb4591535c5639b5e153d46442fb0d8523d775abf6e5f457193730b609d55ad0fd171f28a075c1fa5679f5049279e77cd63b2
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-async-generator-functions@npm:^7.14.7":
-  version: 7.14.7
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.14.7"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.16.0":
+  version: 7.16.2
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.16.2"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-remap-async-to-generator": ^7.14.5
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 6ed9dbbf18b24f6edd2286554f718ea3a1eb3fdae4faece6fabfb68d1e249377d8392ae1931f52ce67fdfcfec26caf8d141bbcce9d6321851b5a08f52070a91e
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.16.0"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
+    "@babel/plugin-proposal-optional-chaining": ^7.16.0
+  peerDependencies:
+    "@babel/core": ^7.13.0
+  checksum: bb115479292e2c66671a62c46a64d8dae1fc8bbf604c83f82a421216e3d40632dbe86e8ba34e66318c215eddfc4f25e6e7fe19123517f1cf5b6003b1efbd911a
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-proposal-async-generator-functions@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.16.0"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.14.5
+    "@babel/helper-remap-async-to-generator": ^7.16.0
     "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 09343a79385615f8d5f95aaef7c44af5e899c82f030f3d73546c2ffffa567c0949f0405052d7e32f643c0eb2a23590a5050f4606855b3506246d3d60e46f32e3
+  checksum: 2ee0d0807256ca0c3d1c5cdc40b5bc2afc43e283222ce9b99ea84d1537ccc2c26bdeaf9a870bc4a00ad9c76763a3ddaca7ad2ff4349d9e318130205d4f2a9fee
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-properties@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.14.5"
+"@babel/plugin-proposal-class-properties@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-class-properties@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.14.5
+    "@babel/helper-create-class-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: fe2aa0a44f8ea121e10c856d6fb4fca418dc42451258ef6ed29321ca740080fba420ebd3d6700d0456c34c2ab2044f9ce4308498321f52a93184ff5adb015aae
+  checksum: b1665ced553e5cdb95eec2fda321cb226c5f255edd1a94b226b9d81e97e026472184b6898af26f2bb9ee64101fad1afe215b6fc469d3103dec78c55e732e49aa
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-static-block@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-class-static-block@npm:7.14.5"
+"@babel/plugin-proposal-class-static-block@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-class-static-block@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.14.5
+    "@babel/helper-create-class-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-class-static-block": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 0275d0643dacd08638c2d3c129158ad0c2dea6a26e78fa4b2129811a29460ff9a6459d1955a19bfa3b9ed67ba2bb3c88676823ad207b2de4f0c65e0c3751d75c
+  checksum: 59c4bb3d6ad4828e7773fe1c63730c68bf646c3a8d042b9ed4062fd98a26c1656b7ee108c5f144fd8b24ff567baf3b2efa644be29c6c8bcfe60e09e485e22116
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-dynamic-import@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.14.5"
+"@babel/plugin-proposal-dynamic-import@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 47be4b5f8824f8690b47d99a34d52de0e6c19d0b99f26c1f9a2e4cc49e05082bcef7248c610bb3830ae84cec928713c7774f4929fca4fa72df570df7a76a9d2b
+  checksum: 4027da640443d8fd4a20637d1dd67cce1c13207b8c19fa77796a08b9eec9881b95322c1a5c489128adf3a12e9bbc02b31de9ddd536c909d072577a74a2a70b67
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-export-namespace-from@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.14.5"
+"@babel/plugin-proposal-export-namespace-from@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b3f4e0cc196f7ad9132816bb350124e8932bc047ab946e431f85bae9649b0de384c54261a60c050a2b8220703408fc089f90349ad008ed69a70944a6f3048d0e
+  checksum: 0bdc166ac44d9a0579e6d14d07ed1364932b4b7852626f4ba0c0011464097ed23bec43a3e93793d888c2854918ce9937ac251a945abbe0d283eaa1df206e0b05
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-json-strings@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.14.5"
+"@babel/plugin-proposal-json-strings@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-json-strings@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-json-strings": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 51dafe70237860569c9c27dc6a0db83e149bf7babb0fcafa9dbcd55a960b443f7b5bb695956c6e116e46b3dbd2a6777ead62bcad843aff8c1916c1be56e2f504
+  checksum: fa93be8eff22ced96a68c9db8c0e930414a4ffb44cf68b473717309c06a4feee2bac6e41415a699c829f29928653d67b4b7d29a45861784d235264d829055a1e
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.14.5"
+"@babel/plugin-proposal-logical-assignment-operators@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 08b6dbc991c4824b0d8bfabf46c8254fce02d2df04627b8849cf15a4b6de75629c10c7c83d1e6834cdcebfc98b16264ce2dd32aa9c0fae900ed2af807d5ac42b
+  checksum: 7e6cd10248803f0c5801805ef1a357314940c3204c3d2f00994711f272c21276f181d0e83ada5bce6185ae2c97c4417e778331505ffc2e71a2b9c4425a5dcc6d
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.14.5"
+"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 033d9483c2feb74928fbb83a73948eb1179c8852d2ae507fbfc37752d2dbf702c9ad0daaf1eaa029f81b12b7e2470061b4f611db88b7293f0e9a71eba288a430
+  checksum: e50f94929970cdc5c6ee22ec4c95c46ae25cdd8c391baf601f7f3d3a3cec417efc663a3fafa9ae5bca82a6815d49687b07cab9857f5a10e9ea862438ecb81e4a
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-numeric-separator@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.14.5"
+"@babel/plugin-proposal-numeric-separator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-numeric-separator": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 22093297ec9aed3938b39f4efa1b518252fe7b0835902c3066f0ae6a864ac253b986a4a21a6092aa068d0702d7b09bed74e56cf39f2da8b4f3f43e0747bffb62
+  checksum: eb7895a4f38263df644a0ded7042991190f23bdec4b53f3e2c8b40b82d2dbc537a6ca9afbfd490d1aa5dd33244e7a51bf1ae0c4c6890d9978bc1adc325b7e795
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-object-rest-spread@npm:^7.14.5, @babel/plugin-proposal-object-rest-spread@npm:^7.14.7":
-  version: 7.14.7
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.14.7"
+"@babel/plugin-proposal-object-rest-spread@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.16.0"
   dependencies:
-    "@babel/compat-data": ^7.14.7
-    "@babel/helper-compilation-targets": ^7.14.5
+    "@babel/compat-data": ^7.16.0
+    "@babel/helper-compilation-targets": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.14.5
+    "@babel/plugin-transform-parameters": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a35192868166fb5a62003a56ce2c266f74ae680f1d9589652c4495145240dd138a9505301bb5adca069cb874d6f0f733dc2f3d1d05f71a06019735c29c4d1a11
+  checksum: c7716ba50e65aae613e553dd568d3f4b4c42fa8d9f1c3aca6cc227670fc792b600cd5a5c710451490f3d7d5916e77607cba45033e199534ca71feed451f63820
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-catch-binding@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.14.5"
+"@babel/plugin-proposal-optional-catch-binding@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f9c1b2b34fef1bde85feeb0b438131f526056161e10b6fb91c74a5828ad39d2a20521b5c3cefc7367a7e5fc792b7c7e607bf278d7999b5d89824c34af3174eae
+  checksum: 5003a1d48fb6bac1661b481681baf7941de518f1f773d9745e65a650e750b715cb69181a4b723e28f4e43b94143b7b0fe5d12ff1ceceda9731f073cd6bf4e195
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-optional-chaining@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.14.5"
+"@babel/plugin-proposal-optional-chaining@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9e39e20d162bea2241b4c24ea8a339f872a04954a5155c606bf2437edaa1a15b8a517daee4b2b09cfd42d826b93c57f080aa9fbb13c60a8f3a7a72963badf2df
+  checksum: 8301e0829220327c8b969b711c5c4ee5aef88b391e5fb7838381bd18c0fd0cf360d3a307ad5c6113414470ae920504dc2c41983af0ddf3762f5c88957e0c3a94
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-private-methods@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.14.5"
+"@babel/plugin-proposal-private-methods@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-private-methods@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.14.5
+    "@babel/helper-create-class-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: badacc1d68c8cf92a7ba973e3c283bc3aebf586a6573b6d18a96461ce18039d4cdc0135edac1b810df8d92cfca628115d98a0ad83ed8f15bf15eaff21539bf32
+  checksum: 6f648f54ea1219262b7a05f86f94de7cb466dc81ffd86e4f37ba536037762457ef13408083eb4325d44d2a5aae27c097756efe1067f5c1fbddb8078b923580f5
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-private-property-in-object@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.14.5"
+"@babel/plugin-proposal-private-property-in-object@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.16.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
-    "@babel/helper-create-class-features-plugin": ^7.14.5
+    "@babel/helper-annotate-as-pure": ^7.16.0
+    "@babel/helper-create-class-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a11da6a52eb13d6dcb6ed36993a81e9746404f6e83d32be16142911b7e5768293d8c4c5373d182ef25cb94d0b18c0c27a07f4553be042ee2dc49f7179f8cbfe2
+  checksum: 9098fb34f4abac376ec5823bf6aaedacd46e6925a6fc62559a8086a110bf39310ee308bfbbed052f047ad803b7148b87e43b6d83a759be0aeab1149efd4b8eeb
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.14.5"
+"@babel/plugin-proposal-unicode-property-regex@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
+    "@babel/helper-create-regexp-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 58bd3277a972a33d101d29ab4f52e964b6e8ec218eb84f764b4ea67bf8ed362909760812d3f7451ee5e54dc273bd81bc5a00cd2c13e8fb64a47ec117cb69d51b
+  checksum: f26b76c9aa680820fe693f768a36e3a2c4d969e72d7a362059fffad7c874eed8a89bde2be5bde650283a685bd879415f8937fb37a9a1397b287a81df0c6f7c23
   languageName: node
   linkType: hard
 
@@ -799,14 +919,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-jsx@npm:7.14.5"
+"@babel/plugin-syntax-jsx@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-syntax-jsx@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3a2ba87534b0f9ee70eba0754d2ae544825c25afd98efb8e42b41399e02de4cc5b1f70fc5ce444fb7a7e5b09972c289eed2f00917be5b88d67407f4cbde8e960
+  checksum: 34afe4030c249ed5a559c7d164b317a6209f3fca2db7dee7ecb8413af84167381d82f23517bf8e41d359da07da9b0fd2c0472e81c4389e5cc9d1997a308d49de
   languageName: node
   linkType: hard
 
@@ -898,111 +1018,111 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-syntax-typescript@npm:7.14.5"
+"@babel/plugin-syntax-typescript@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-syntax-typescript@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5447d13b31aeeeaa5c2b945e60a598642dedca480f11d3232b0927aeb6a6bb8201a0025f509bc23851da4bf126f69b0522790edbd58f4560f0a4984cabd0d126
+  checksum: 2da3bdd031230e515615fe39c50d40064d04f64f1d2b60113adff2c112a27e4f9425425e604297d5c2af2b635e7980f3677e434dfeb1d7320ad2cd1ffc8e8c2a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.14.5"
+"@babel/plugin-transform-arrow-functions@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 126196ea0107e97f711c0d48d8d1e01a30f5a5e127628f7367658b4c5832182c4e28914294408374690c5bfbb4ad4fe6560068d8bf370cafe8d4fe23599aaa95
+  checksum: ff647300424968d1cd6c6b015fd72d332042a94c7b08f3e785f32d22364bfad49258a41c53675de08573af98da1a623efa03da13a653f06988f79a9d571f7030
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.14.5"
+"@babel/plugin-transform-async-to-generator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.16.0"
   dependencies:
-    "@babel/helper-module-imports": ^7.14.5
+    "@babel/helper-module-imports": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-remap-async-to-generator": ^7.14.5
+    "@babel/helper-remap-async-to-generator": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4c47016c5f65adaa5836054fcc99402f1d295aedd7ebd44e6df128a90977952f2a8abdf3b3d0aa5a9e1186184da538452c4d9a3b1482376759c6962627201da5
+  checksum: 2ebf505f43350d246007d754577477ddb0132c4ab39c9fd420d36ebb6e489b2b3eb48f27fe58f7ad0c742946a1e81e3b150666507abab03fe6bd649ff585ed45
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.14.5"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9994d9f107308b21be043de115fe1d06956807d93a3039ddab54333d1fbb39ad50cc5f9eccaedf5317f4699230e923662254974f3a974c4f000e986837bc020a
+  checksum: f7efc5d8ce9242e11c94c82d9c940d4c534a751ff3679839d2f7d7a300c29ac4c4a3c26c238b5f2828201cac8a848bfb6342c285460f6ce5bc267cbdc1bb070b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.14.5"
+"@babel/plugin-transform-block-scoping@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d317d636d0475317302e9c8b01cf9214fac3ff9353b23d0d16285f196f5c7b95b7864a8e8eaf51a3e1b650649203855f80a58b7a2caef4b0ee9793e7349a0ec5
+  checksum: e5bcb9eeed7974ee6dd14c360c21ad2465f81342001e5468bbec5db483fffc78bb0e7f84155be6c32588bc0b43a6ca0050c7962400b33d134f6298c31c8073d4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-classes@npm:7.14.5"
+"@babel/plugin-transform-classes@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-classes@npm:7.16.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
-    "@babel/helper-function-name": ^7.14.5
-    "@babel/helper-optimise-call-expression": ^7.14.5
+    "@babel/helper-annotate-as-pure": ^7.16.0
+    "@babel/helper-function-name": ^7.16.0
+    "@babel/helper-optimise-call-expression": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-replace-supers": ^7.14.5
-    "@babel/helper-split-export-declaration": ^7.14.5
+    "@babel/helper-replace-supers": ^7.16.0
+    "@babel/helper-split-export-declaration": ^7.16.0
     globals: ^11.1.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 42fc333a0d8a6a90b5c75e90d2ec21494f711ab7c58f2d074d95726cdd38f137e74653602a82d2d1a3e9bc504b5eff62418d70048514b672c9bd108bfb866e25
+  checksum: 7db47296045761b3f35a9075b4bcce99ad5aa93714cca235961fa596983ba6cfd4d84b29fa6745e4752bd2a60ac299b0dee3231ce20061b6798ae16a147e4992
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.14.5"
+"@babel/plugin-transform-computed-properties@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 87bd4c46255359ab8d53d0e9b5aa5e1ef218c1447874bd8c2eff759d3a2b5fe6b3ec55046babe0087f7e3890f6167524c729737e912080ea1c9758a559765130
+  checksum: 0f86de419cf5daf28b01c5b2feafa426e5b0ec776290e731de3d7a6ec4ec742400e13436d67292e500ecd50e21ddab9ae34da79357a85a443d30dc94f2a4f6a3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.14.7":
-  version: 7.14.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.14.7"
+"@babel/plugin-transform-destructuring@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-destructuring@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0b0cf8ed9fb92c53e3888c17402c4f1e8f329f05a759829b559df883b19b442d3950b7f319df419d0cff122ea76fc8b3b55779fdbb9e394e5f058419a8d5ba14
+  checksum: 0a499c9abd6b50d4da6a3c8416e3cdf305f8002fddb3bd9ddd0774ba17ab1b10134f79fe8edc495c94344e5ab387626fb0ee124d31810758968a92d573ff9034
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.14.5"
+"@babel/plugin-transform-dotall-regex@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
+    "@babel/helper-create-regexp-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4da3dac9580823c1fe8aaedf6109d3a26d17ad7ef7d1b278ddbcd7c148e02c465cf49250794529a34bac0bda6b53db558ae08d185a96b76efaaa17a5da3911df
+  checksum: c1f381f0d44a1b33714a68ffd60f2b9efac1be95caf3c21192cc8233afde2fae1da268e26b3cb40764736f090793b66946574c3310cfdd4906a7e72310239ff9
   languageName: node
   linkType: hard
 
@@ -1018,387 +1138,388 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.14.5"
+"@babel/plugin-transform-duplicate-keys@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c6c951d2f7ed528a8103d08293d4aaf95efa38c697e7b2b27b7e6c9780280484373e2f7ef8d77daf17dffdc86748fbf75e776e0542b1c7b17e29308bc31ebd8c
+  checksum: 66f09487fdf737aa280c780a609bafc9a771b34b5f9a8dccf69752c22110893763f6c105062776f084ed872a55d1656b3f14e2a9c2031f3dbdf31da20d9c827b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.14.5"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.16.0"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.14.5
+    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7588a582d0bc5c80fda7f1c631354a35a9a7d284dd80ccaf2bbfd086a39a9d6461718dc7dd45a3ca59228593270a7c6a907a9cbe7ddc349d80c7342af0263c5c
+  checksum: 22e1d4804a5fc522744a1cc13e2c35c5d81c2e303a634822fee59829477b3748dcf897a020c3083084350ab1d3b76752157b216971157763394021e2f2184094
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-for-of@npm:7.14.5"
+"@babel/plugin-transform-for-of@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-for-of@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: aeb76eb11d10b2390996001e2fd529bbaf3695edd306d24e4eba87b8137c10a6afda3896017f88fcf40fd2334cc424c0a111fad34e10c747e81e577e5957e328
+  checksum: 504d967b30b00d3e1a2784f6a215963fc0036871f8fd6ca61e41e67cdb3319511e9148164428144469416b35b0e02c896c144402ace7cd7a6c45b0d1e8746ae6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-function-name@npm:7.14.5"
+"@babel/plugin-transform-function-name@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-function-name@npm:7.16.0"
   dependencies:
-    "@babel/helper-function-name": ^7.14.5
+    "@babel/helper-function-name": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3db2fa1bcd21b76a91ce78db8ebca047fdadbf198f816e2621e531a751a0d40976cf2a25262dee9352fd0c53bff5b25fddefadebdbb4ba3da6d89b849ab075b6
+  checksum: 289f4fce26e8b3a81fcae752cecdb78b363eb29e400aa4dc8318484156d908ddc6dd5b274b8fbcdb80ea59a362834554c4a5d3454e974957dbd2b30c3d00ad3f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-literals@npm:7.14.5"
+"@babel/plugin-transform-literals@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-literals@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2341cfaaf8ac7199c578407ea4de41205d3d74c5a48899aa96c41b08c09d18c46d9018fdc6a2f69f0bccc2662223afc47b60130ae4ff36a79351fface71a61f3
+  checksum: 7291771c7626a27684053ceefc4e2e3e480a6ceab9f3c8abbdd9c90fcea63f035ace397e53bfc4b7311b835f7c79449be03226affa69e2e2a96c14b6da4d5db9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.14.5"
+"@babel/plugin-transform-member-expression-literals@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a94ff910e8d0e28effd58c64f2d15c9772ea4c209644f116fd81dc5c93ce232304f42ef14d5ec2baf095c824786698fcf6c1d4c91952dc3762350f4ec0eb1f17
+  checksum: d5ed6cf840b9fd8b88f719dea46dc26a1778f10aeab6878b3eabf2350cfa813bfeff09d91c6afc93dd3536a48bc892a0afcf9f99f3bad6b54b41638f3ae80fa9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.14.5"
+"@babel/plugin-transform-modules-amd@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.16.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.14.5
+    "@babel/helper-module-transforms": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
     babel-plugin-dynamic-import-node: ^2.3.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 963d9ebb11b282d5c5f462e3e1ad6991e60fb4d190b5a7aa0d9937e0fa83d89cf5f94268f0b0b343576f2cee0cf545bcaf40da40eb8b9dca5c79840fd86a65ed
+  checksum: c37ccb8cd7a301123fb5590712d957bf9f82bb0d89a83441b570a9f9793af76b99449c93f1079ad187fb598a5eeb5571561ff4d71af9192c7d6e407a464d6aff
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.14.5"
+"@babel/plugin-transform-modules-commonjs@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.16.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.14.5
+    "@babel/helper-module-transforms": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-simple-access": ^7.14.5
+    "@babel/helper-simple-access": ^7.16.0
     babel-plugin-dynamic-import-node: ^2.3.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5cc41ee904e421c32f692ce10985190bc8f995df63ee1fd899ea80ce50b4b8408c7f2fddf16e01345244fc5702c8b9c0772afdd934e325c4e468840daa9bee04
+  checksum: a7e43670f503b31d6ad42977ddefb7bffc23f700a24252859652aa03efd666698567b0817060dd6f84a6cd23e7aac7464bc0dc7f7f929cad212263abcac9d470
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.14.5"
+"@babel/plugin-transform-modules-systemjs@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.16.0"
   dependencies:
-    "@babel/helper-hoist-variables": ^7.14.5
-    "@babel/helper-module-transforms": ^7.14.5
+    "@babel/helper-hoist-variables": ^7.16.0
+    "@babel/helper-module-transforms": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-validator-identifier": ^7.14.5
+    "@babel/helper-validator-identifier": ^7.15.7
     babel-plugin-dynamic-import-node: ^2.3.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3ca0bb1c0c22a3d705476186afa9fc86398ae4662afc259ff29c1942e3c8770f4bdadaf67418a21816964d4e1eaf07412eeabccccfaa9d45eac735f971ad148b
+  checksum: 4aa9bd45a4c1f79a4abd92482b4f9ac6492b5e727ee34316c80a30b6524281d39959a2d556b231eae4b1031f35e0133e60270f9e4bfa5f25a8cb68ef145dfcd2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.14.5"
+"@babel/plugin-transform-modules-umd@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.16.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.14.5
+    "@babel/helper-module-transforms": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 455ff383bed47e104d4b2b32f11bc5a44a25c797fad26b5eab9b8a81856f9945350b45ad28b9b20b0bbf324832c7a826c9c3d6f865e85c26a1771663132e4145
+  checksum: b07d41eae3a1163fdb2dca4bffb0de880981e6581163948a88b7665709e860612932f5a73e54d70057e834d3968e3b5f86222f1d302c9e1d34d95a764584af54
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.14.7":
-  version: 7.14.7
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.14.7"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
+    "@babel/helper-create-regexp-features-plugin": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 3c68bc77cce387750ecd32d33e9ad0f0968245fbe03b36ec8dddc52bee3ee84757205db3b3b4fc605e055f08769312ef4dbf4a0c8adb8f02eb04b142ffcdf265
+  checksum: 758a87aca66ea7944c5f94ed7a798220c3b2986da4c38dc3f63221065ec96534bf39b3b043dd9759dbdff4026d340bbe51082d5ad4505c19b08893663130675b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-new-target@npm:7.14.5"
+"@babel/plugin-transform-new-target@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-new-target@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5b806c86926cd0b03fa2f22cf21a6d6a86e5831b80e8a1e898877acd3a03fd07078e45da33b671200ec98a5c7ac9be2f3592cd88933e262feffba248ca7ca4e7
+  checksum: c741ba3e84c182f1af3174cb7f00c4e434080ff882e72c7b2743d1d636eebcf12c865772be051a323c823bd4ebdfbae19cb78e95218d6b14c338f27a64608e31
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-object-super@npm:7.14.5"
+"@babel/plugin-transform-object-super@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-object-super@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-replace-supers": ^7.14.5
+    "@babel/helper-replace-supers": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 88477a8b27e76042ffbff1345088422f5b3135346d69f264e71d90b3749a3d73d5a579c97a33cd11c61c5d499a655911c7cd97dbe68edb36e090dfd5f154d777
+  checksum: b6ed0a8f5a1231b4dadb5edb2cef8fba7957cbad943c0018002719d066fda93b805da961e42b38d625e43e7c79f5c07d5719d6d63f9cf178501882a4aa5d30da
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-parameters@npm:7.14.5"
+"@babel/plugin-transform-parameters@npm:^7.16.0":
+  version: 7.16.3
+  resolution: "@babel/plugin-transform-parameters@npm:7.16.3"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 932bc616be7b5542ba2371c85cfcc579a8556b9e5a5ea5535b7f0ec5b68284ed2a3724ae181f1a22719b5ea6539c82f5fcee37d9f45f08ed72eb9e43a0940b56
+  checksum: 7c0154fa66f03f69f6767adc01e72ef00d50cae8eb87c65506adccccc1cf776730ecbb96a5de0127910554cc0e86e375bc437fa085f619783d368936736a4f58
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-property-literals@npm:7.14.5"
+"@babel/plugin-transform-property-literals@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-property-literals@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 426e7b13a048220314e35bd4e6732640293c616173ef05ceca3a2bfadd043199e35ec693f1604f77178c3a88bea241b6d7ce92d8fc837faeb37117ad7866350f
+  checksum: e9eb9355db4cf18dc82879174fc2de6590521afea04f1c80c5805d3f759bfa25946bcac1095b5fe0e4ad3f5eb330cd7e308467626a0212f07b9f41b9f00affa8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.14.5"
+"@babel/plugin-transform-react-display-name@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d7ca35d5e8d7d91ac82b17e1bd68dd4a7dcfae54da95b28d072907799503e2ec234f34dd869c9fee299a29e73e7b5ce3d4c748cf2a29c25d39f9523be130dba3
+  checksum: 82ca59676ccf5179585828c64b5703aec597d78fe4adf788579529d02b071b0fc6c2df69aa033118b7ac1c12e1dc418046fe7e9c6a593e1005beacc2846f4281
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.14.5"
+"@babel/plugin-transform-react-jsx-development@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.16.0"
   dependencies:
-    "@babel/plugin-transform-react-jsx": ^7.14.5
+    "@babel/plugin-transform-react-jsx": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b49d6e703aeb4fbaacbb8449418dc3c599bcb3ce608cb900ed21a288c3bce42a33209524693b1978766b645aa2b751c15aa9da5337cc6ac2a79fd9b7c9ae9246
+  checksum: 2724db0d24779107a6e019f4be17e894e26dc23e33f797b3cd750afc0db33d477db27d6aafb63eb459e3514fdd9f408b9487c7db3d7c6858129382e9c26352dc
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.14.5"
+"@babel/plugin-transform-react-jsx@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.16.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
-    "@babel/helper-module-imports": ^7.14.5
+    "@babel/helper-annotate-as-pure": ^7.16.0
+    "@babel/helper-module-imports": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-jsx": ^7.14.5
-    "@babel/types": ^7.14.5
+    "@babel/plugin-syntax-jsx": ^7.16.0
+    "@babel/types": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4be6ba0a0303691ce7e16363da1ae446a5cd6eb63ba5729cd7af21b0e7927c07bb8595482836cbda0f41b39fa979c37f4504ef7c23729085f84fac1659615542
+  checksum: c4fd2307750f3903ce1ff83e3eac5ebc3ef38838c542ff92676332d98292cacb60b91c19f49e30c9442494937c692992160101ae28175af0e1b1c7b40936e8c0
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.14.5"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.16.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.14.5
+    "@babel/helper-annotate-as-pure": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3b62cc6af2c838eabc28c07473eab1392b41a5db2f0f326b1ba3ec52b95529e1c46098d6a259c7debb6a17489445828b89f7737a6fb85345ea5d27e4819a31fe
+  checksum: b06c0f5efd7bc6118d43ad1e3a8cb94ebe01b19cff6fbeab0941801d1013b7bc372d2db9742b1ed746a89828a955f8dab9eb460d21fc3af352038de4cb0c6184
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-regenerator@npm:7.14.5"
+"@babel/plugin-transform-regenerator@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-regenerator@npm:7.16.0"
   dependencies:
     regenerator-transform: ^0.14.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f606bc04da7d0cfd651914cb144e85a0ea6fe20ee453ed21d002747cc47b09c853bc97166c32dc47e959581b772d9883f7d96d1c8e795c81ed21dbbb300e3aa7
+  checksum: 32b1b43f8d55d9e78e87bbc6a19b0bb0ff968220e215e9a3984c0de140048c54c62cf46889bee16f987221eab112909318de391426df33cdbe3fd710480068f7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.14.5"
+"@babel/plugin-transform-reserved-words@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 8a40d7b48e1b4a549272d603e7b28ead70213e12353d65edd07156b7169d7933cee8b79987b54f374f3c41b835d941aca4b13b8aa23a922c94113af2131ca686
+  checksum: 7a8288cfe2375e43579d3786d5f6654b36d8344b1be3df4fbafe81ae49bf634f85f68fe5a1a280f56aa7d626deaaa6ba89e586422b3d8b13f7d4b0e0617362d6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-runtime@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-runtime@npm:7.14.5"
+"@babel/plugin-transform-runtime@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-runtime@npm:7.16.0"
   dependencies:
-    "@babel/helper-module-imports": ^7.14.5
+    "@babel/helper-module-imports": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    babel-plugin-polyfill-corejs2: ^0.2.2
-    babel-plugin-polyfill-corejs3: ^0.2.2
-    babel-plugin-polyfill-regenerator: ^0.2.2
+    babel-plugin-polyfill-corejs2: ^0.2.3
+    babel-plugin-polyfill-corejs3: ^0.3.0
+    babel-plugin-polyfill-regenerator: ^0.2.3
     semver: ^6.3.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 563762ece9b83ad62df5600140b3182e896c3c39f2d6629f2f91fb50a840fa79bf31c5105b73038422982dcb319cc2dbf3955a1b6350ff4a1bc5503f165a0e36
+  checksum: f3ca8c78c24305f70c412f9a93ef81efee15360cdf93337d8dc3a9aeb2ad2ff169ab96dea8e9eac2bd20c2c3cf3c93626539dcecbca819831965b4f9d6884b09
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.14.5"
+"@babel/plugin-transform-shorthand-properties@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 60cdd17e347a6a0973c8ea5c08ae4b3f8e59ce0e188453c4bda045d2a5c34495af8e0e9393631aa9f3fd51282455b9c5d6ba07e262576171dbe2b4094bdaf8ad
+  checksum: 7ae0f218aaccd2f7e8b0027c558fbbc291f7df7c83749826075776de780d1ac421f9056c760c5eb2e486b7b1983a41cd8dc00589504904b833c810fdb80b3868
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.14.6":
-  version: 7.14.6
-  resolution: "@babel/plugin-transform-spread@npm:7.14.6"
+"@babel/plugin-transform-spread@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-spread@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.14.5
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 20c11de962dd7ddab110d6c4ab9f3c0bea97393ce09cbe4e46be53182c3df0577eaf0e31aaa2d76344ae21ed3a3b7e779fe814b845d188e11a6031c619648b89
+  checksum: c295ef5e329fc31bd78e0aac3d6d848475a26e40cffff207dfd450416a25478bedb03402a0cc569bc5b7d3e92c22bff8a7cf76f1a9d896070e3cdeae1aee0316
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.14.5"
+"@babel/plugin-transform-sticky-regex@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6d77e0641c4c72203d592d54fdb11770de22a34d659d3335e4c537e95b930d03142b11f1d41d103da3de063c628a0f34bdd4c6534b591bc59d9ce67fafb836dc
+  checksum: 80c7ccb797e4d31f112ace4614e8259ad0707eab3ed1c5a900ac0799dc23fded8bad57142ceb29222d6f0645f7b0d6a74fa133c945b8611d5db137b13ee68882
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-template-literals@npm:7.14.5"
+"@babel/plugin-transform-template-literals@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-template-literals@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 56d273470c16e83bac1bfab5057a64f23191b51460a009b522b3b29806d7a9f64cbd94323836ceb997c4f331b85564f952eb5566c7bd140d0b278f0191a31985
+  checksum: 230638ee56bbe8c4237d2c3366d700eca1f66f93c37935f6d775f699c5d2593e3f176e81010cfb2d46f89e340c6c042649263c3b913ce269182fadfb4db01369
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.14.5"
+"@babel/plugin-transform-typeof-symbol@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1e71ec00ea8b64522b8677c030f334cc5b3833a5b7269a152a2ba7a6b36f0e0a4333a61072e69113e4062e71554d4751ef2e3ddd5e81994978123323f266981c
+  checksum: 60e91d57b3e5a5ca02cebbf9f6dacd06e8a3b7c92c54fd60616f01ac1c79b3ec5fd2e8c5fa5c86ffcd9da6fa811e6de8dc7602cf1e05da17def0ea06f1e8548e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.14.5":
-  version: 7.14.6
-  resolution: "@babel/plugin-transform-typescript@npm:7.14.6"
+"@babel/plugin-transform-typescript@npm:^7.16.0":
+  version: 7.16.1
+  resolution: "@babel/plugin-transform-typescript@npm:7.16.1"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.14.6
+    "@babel/helper-create-class-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
-    "@babel/plugin-syntax-typescript": ^7.14.5
+    "@babel/plugin-syntax-typescript": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: cb3117cfc9c8ebf9612b137eb660448e79a876a189fcad6b79641faa7200073bbfd08bf0e63c7ddb3a35b3d31457d6e90cf63565e64446a73866290dc97353fa
+  checksum: 1b1efe62e8de828d52b996429718663705cbefb9a7382d2849725b6318051fcbe9671e9e8f761a94fddf46ea159810c97d1b6282c644f69c98ebf5d4d2687ef6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.14.5"
+"@babel/plugin-transform-unicode-escapes@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2a6979c5b886d9c7d9d3887374d75384542fe05a71eb7738b2cde659386089a930d37d1a34ffb4b87def98fbed3526d78b7cd5dd9bffde4d406b368faba81b7d
+  checksum: 63ac80d6b7592a7a038cde0b7b8fd7fc8f478de107543fb20c0ee47e00c5cd4c12be936501f55e2fd9370056603d9c4e4c57cdf335674837475865f80b4ae734
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.14.5"
+"@babel/plugin-transform-unicode-regex@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.16.0"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.14.5
+    "@babel/helper-create-regexp-features-plugin": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1b7a4c0dc6b07390f991e7cac8409f7a1ae74495d94b9e1fb5a716d5362a349a35717cfad883074e3f80e16bb630bbd1986a3436f739f6b01c30a96ef3f9ea9a
+  checksum: 61e498425fb44951067e1d17cd66e97777a340118c06943cee9d1032a8bfec661f262738a9b2a00a498b0ad5ba56551ea81e76f0d6afe46c0301abc3a86bee22
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:^7.14.5":
-  version: 7.14.7
-  resolution: "@babel/preset-env@npm:7.14.7"
+"@babel/preset-env@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/preset-env@npm:7.16.0"
   dependencies:
-    "@babel/compat-data": ^7.14.7
-    "@babel/helper-compilation-targets": ^7.14.5
+    "@babel/compat-data": ^7.16.0
+    "@babel/helper-compilation-targets": ^7.16.0
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/helper-validator-option": ^7.14.5
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.14.5
-    "@babel/plugin-proposal-async-generator-functions": ^7.14.7
-    "@babel/plugin-proposal-class-properties": ^7.14.5
-    "@babel/plugin-proposal-class-static-block": ^7.14.5
-    "@babel/plugin-proposal-dynamic-import": ^7.14.5
-    "@babel/plugin-proposal-export-namespace-from": ^7.14.5
-    "@babel/plugin-proposal-json-strings": ^7.14.5
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.14.5
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.14.5
-    "@babel/plugin-proposal-numeric-separator": ^7.14.5
-    "@babel/plugin-proposal-object-rest-spread": ^7.14.7
-    "@babel/plugin-proposal-optional-catch-binding": ^7.14.5
-    "@babel/plugin-proposal-optional-chaining": ^7.14.5
-    "@babel/plugin-proposal-private-methods": ^7.14.5
-    "@babel/plugin-proposal-private-property-in-object": ^7.14.5
-    "@babel/plugin-proposal-unicode-property-regex": ^7.14.5
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.16.0
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.16.0
+    "@babel/plugin-proposal-async-generator-functions": ^7.16.0
+    "@babel/plugin-proposal-class-properties": ^7.16.0
+    "@babel/plugin-proposal-class-static-block": ^7.16.0
+    "@babel/plugin-proposal-dynamic-import": ^7.16.0
+    "@babel/plugin-proposal-export-namespace-from": ^7.16.0
+    "@babel/plugin-proposal-json-strings": ^7.16.0
+    "@babel/plugin-proposal-logical-assignment-operators": ^7.16.0
+    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.0
+    "@babel/plugin-proposal-numeric-separator": ^7.16.0
+    "@babel/plugin-proposal-object-rest-spread": ^7.16.0
+    "@babel/plugin-proposal-optional-catch-binding": ^7.16.0
+    "@babel/plugin-proposal-optional-chaining": ^7.16.0
+    "@babel/plugin-proposal-private-methods": ^7.16.0
+    "@babel/plugin-proposal-private-property-in-object": ^7.16.0
+    "@babel/plugin-proposal-unicode-property-regex": ^7.16.0
     "@babel/plugin-syntax-async-generators": ^7.8.4
     "@babel/plugin-syntax-class-properties": ^7.12.13
     "@babel/plugin-syntax-class-static-block": ^7.14.5
@@ -1413,54 +1534,54 @@ __metadata:
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
     "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-transform-arrow-functions": ^7.14.5
-    "@babel/plugin-transform-async-to-generator": ^7.14.5
-    "@babel/plugin-transform-block-scoped-functions": ^7.14.5
-    "@babel/plugin-transform-block-scoping": ^7.14.5
-    "@babel/plugin-transform-classes": ^7.14.5
-    "@babel/plugin-transform-computed-properties": ^7.14.5
-    "@babel/plugin-transform-destructuring": ^7.14.7
-    "@babel/plugin-transform-dotall-regex": ^7.14.5
-    "@babel/plugin-transform-duplicate-keys": ^7.14.5
-    "@babel/plugin-transform-exponentiation-operator": ^7.14.5
-    "@babel/plugin-transform-for-of": ^7.14.5
-    "@babel/plugin-transform-function-name": ^7.14.5
-    "@babel/plugin-transform-literals": ^7.14.5
-    "@babel/plugin-transform-member-expression-literals": ^7.14.5
-    "@babel/plugin-transform-modules-amd": ^7.14.5
-    "@babel/plugin-transform-modules-commonjs": ^7.14.5
-    "@babel/plugin-transform-modules-systemjs": ^7.14.5
-    "@babel/plugin-transform-modules-umd": ^7.14.5
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.14.7
-    "@babel/plugin-transform-new-target": ^7.14.5
-    "@babel/plugin-transform-object-super": ^7.14.5
-    "@babel/plugin-transform-parameters": ^7.14.5
-    "@babel/plugin-transform-property-literals": ^7.14.5
-    "@babel/plugin-transform-regenerator": ^7.14.5
-    "@babel/plugin-transform-reserved-words": ^7.14.5
-    "@babel/plugin-transform-shorthand-properties": ^7.14.5
-    "@babel/plugin-transform-spread": ^7.14.6
-    "@babel/plugin-transform-sticky-regex": ^7.14.5
-    "@babel/plugin-transform-template-literals": ^7.14.5
-    "@babel/plugin-transform-typeof-symbol": ^7.14.5
-    "@babel/plugin-transform-unicode-escapes": ^7.14.5
-    "@babel/plugin-transform-unicode-regex": ^7.14.5
-    "@babel/preset-modules": ^0.1.4
-    "@babel/types": ^7.14.5
-    babel-plugin-polyfill-corejs2: ^0.2.2
-    babel-plugin-polyfill-corejs3: ^0.2.2
-    babel-plugin-polyfill-regenerator: ^0.2.2
-    core-js-compat: ^3.15.0
+    "@babel/plugin-transform-arrow-functions": ^7.16.0
+    "@babel/plugin-transform-async-to-generator": ^7.16.0
+    "@babel/plugin-transform-block-scoped-functions": ^7.16.0
+    "@babel/plugin-transform-block-scoping": ^7.16.0
+    "@babel/plugin-transform-classes": ^7.16.0
+    "@babel/plugin-transform-computed-properties": ^7.16.0
+    "@babel/plugin-transform-destructuring": ^7.16.0
+    "@babel/plugin-transform-dotall-regex": ^7.16.0
+    "@babel/plugin-transform-duplicate-keys": ^7.16.0
+    "@babel/plugin-transform-exponentiation-operator": ^7.16.0
+    "@babel/plugin-transform-for-of": ^7.16.0
+    "@babel/plugin-transform-function-name": ^7.16.0
+    "@babel/plugin-transform-literals": ^7.16.0
+    "@babel/plugin-transform-member-expression-literals": ^7.16.0
+    "@babel/plugin-transform-modules-amd": ^7.16.0
+    "@babel/plugin-transform-modules-commonjs": ^7.16.0
+    "@babel/plugin-transform-modules-systemjs": ^7.16.0
+    "@babel/plugin-transform-modules-umd": ^7.16.0
+    "@babel/plugin-transform-named-capturing-groups-regex": ^7.16.0
+    "@babel/plugin-transform-new-target": ^7.16.0
+    "@babel/plugin-transform-object-super": ^7.16.0
+    "@babel/plugin-transform-parameters": ^7.16.0
+    "@babel/plugin-transform-property-literals": ^7.16.0
+    "@babel/plugin-transform-regenerator": ^7.16.0
+    "@babel/plugin-transform-reserved-words": ^7.16.0
+    "@babel/plugin-transform-shorthand-properties": ^7.16.0
+    "@babel/plugin-transform-spread": ^7.16.0
+    "@babel/plugin-transform-sticky-regex": ^7.16.0
+    "@babel/plugin-transform-template-literals": ^7.16.0
+    "@babel/plugin-transform-typeof-symbol": ^7.16.0
+    "@babel/plugin-transform-unicode-escapes": ^7.16.0
+    "@babel/plugin-transform-unicode-regex": ^7.16.0
+    "@babel/preset-modules": ^0.1.5
+    "@babel/types": ^7.16.0
+    babel-plugin-polyfill-corejs2: ^0.2.3
+    babel-plugin-polyfill-corejs3: ^0.3.0
+    babel-plugin-polyfill-regenerator: ^0.2.3
+    core-js-compat: ^3.19.0
     semver: ^6.3.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ebebc20ada68c92b67375926021d576af3636a279aee7625c1e234880355c8669188483aecfff2d478c1caa9fcf18b569ea329060b479236b04baed2bdf796d5
+  checksum: dcd07a9daa0400c7f02a3b6aec6f58156731f21d013495bbba0d09efa5f843d6d5b3d19f43e09578fbcc0b53555958466f444d1ec88a43c59d3b85cb75563da7
   languageName: node
   linkType: hard
 
-"@babel/preset-modules@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "@babel/preset-modules@npm:0.1.4"
+"@babel/preset-modules@npm:^0.1.5":
+  version: 0.1.5
+  resolution: "@babel/preset-modules@npm:0.1.5"
   dependencies:
     "@babel/helper-plugin-utils": ^7.0.0
     "@babel/plugin-proposal-unicode-property-regex": ^7.4.4
@@ -1469,36 +1590,36 @@ __metadata:
     esutils: ^2.0.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7c6500be06be9a341e377eb63292a4a22d0da2b4fb8c68714aff703ddb341cbd58e37d4119d64fc3e602f73801103af471fca2c60b4c1e48e08eea3e6b1afc93
+  checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10
   languageName: node
   linkType: hard
 
-"@babel/preset-react@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/preset-react@npm:7.14.5"
+"@babel/preset-react@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/preset-react@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/helper-validator-option": ^7.14.5
-    "@babel/plugin-transform-react-display-name": ^7.14.5
-    "@babel/plugin-transform-react-jsx": ^7.14.5
-    "@babel/plugin-transform-react-jsx-development": ^7.14.5
-    "@babel/plugin-transform-react-pure-annotations": ^7.14.5
+    "@babel/plugin-transform-react-display-name": ^7.16.0
+    "@babel/plugin-transform-react-jsx": ^7.16.0
+    "@babel/plugin-transform-react-jsx-development": ^7.16.0
+    "@babel/plugin-transform-react-pure-annotations": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 413c507f853b95c71ecb64f29ea7b0786464a237c54977b03a4410dd837b03bfa55df81d0e337f9792d9abc61f4bf3d616f857d00a36ff4ede79407c143ac865
+  checksum: 88b0aab22129a57a30edcfec7f308bf09091d6129c4a9a280fe96557ebec442d8dded893a03fecd236a41832fc755a0ca1b2c89776377822050b0cd1d2551355
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:^7.14.5":
-  version: 7.14.5
-  resolution: "@babel/preset-typescript@npm:7.14.5"
+"@babel/preset-typescript@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/preset-typescript@npm:7.16.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.14.5
     "@babel/helper-validator-option": ^7.14.5
-    "@babel/plugin-transform-typescript": ^7.14.5
+    "@babel/plugin-transform-typescript": ^7.16.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c4f60abfa96c380e16f38b9206a1009a5cbc01866da83ca731fa360c0bf7dca11ca930179bba476ab77e270e2567f28439244d4f495dce9d39647a7273c04949
+  checksum: 9b22316e96a34836c113f60c49d58023c8ba4219bcb0843a7685c04511486cf7c610e0d30551a1417809e2fd039884c847f6ede46abe2b8d520140e15fb36aaf
   languageName: node
   linkType: hard
 
@@ -1511,7 +1632,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.10.5, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.13.8, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.14.6":
+"@babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.14.6":
   version: 7.14.6
   resolution: "@babel/runtime@npm:7.14.6"
   dependencies:
@@ -1538,6 +1659,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.9.2":
+  version: 7.16.3
+  resolution: "@babel/runtime@npm:7.16.3"
+  dependencies:
+    regenerator-runtime: ^0.13.4
+  checksum: ab8ac887096d76185ddbf291d28fb976cd32473696dc497ad4905b784acbd5aa462533ad83a5c5104e10ead28c2e0e119840ee28ed8eff90dcdde9d57f916eda
+  languageName: node
+  linkType: hard
+
 "@babel/runtime@npm:^7.7.2":
   version: 7.10.4
   resolution: "@babel/runtime@npm:7.10.4"
@@ -1569,7 +1699,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.14.5":
+"@babel/template@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/template@npm:7.16.0"
+  dependencies:
+    "@babel/code-frame": ^7.16.0
+    "@babel/parser": ^7.16.0
+    "@babel/types": ^7.16.0
+  checksum: 940f105cc6a6aee638cd8cfae80b8b80811e0ddd53b6a11f3a68431ebb998564815fb26511b5d9cb4cff66ea67130ba7498555ee015375d32f5f89ceaa6662ea
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:^7.13.0":
   version: 7.14.7
   resolution: "@babel/traverse@npm:7.14.7"
   dependencies:
@@ -1586,6 +1727,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.16.3":
+  version: 7.16.3
+  resolution: "@babel/traverse@npm:7.16.3"
+  dependencies:
+    "@babel/code-frame": ^7.16.0
+    "@babel/generator": ^7.16.0
+    "@babel/helper-function-name": ^7.16.0
+    "@babel/helper-hoist-variables": ^7.16.0
+    "@babel/helper-split-export-declaration": ^7.16.0
+    "@babel/parser": ^7.16.3
+    "@babel/types": ^7.16.0
+    debug: ^4.1.0
+    globals: ^11.1.0
+  checksum: abb14857b1104c73124612954865e28f95a86eb6741f35851369b4f9eabc17e394c9aa6f21fba6ce23813592353090d409772be828717cbe5154a5e981a753c1
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.4.5":
   version: 7.10.4
   resolution: "@babel/traverse@npm:7.10.4"
@@ -1624,6 +1782,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.16.0":
+  version: 7.16.0
+  resolution: "@babel/types@npm:7.16.0"
+  dependencies:
+    "@babel/helper-validator-identifier": ^7.15.7
+    to-fast-properties: ^2.0.0
+  checksum: 5b483da5c6e6f2394fba7ee1da8787a0c9cddd33491271c4da702e49e6faf95ce41d7c8bf9a4ee47f2ef06bdb35096f4d0f6ae4b5bea35ebefe16309d22344b7
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.4.4":
   version: 7.12.1
   resolution: "@babel/types@npm:7.12.1"
@@ -1646,7 +1814,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/autocomplete@npm:^0.19.0, @codemirror/autocomplete@npm:^0.19.3":
+"@codemirror/autocomplete@npm:^0.19.0":
   version: 0.19.3
   resolution: "@codemirror/autocomplete@npm:0.19.3"
   dependencies:
@@ -1673,17 +1841,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/commands@npm:^0.19.2":
-  version: 0.19.2
-  resolution: "@codemirror/commands@npm:0.19.2"
+"@codemirror/commands@npm:^0.19.0":
+  version: 0.19.4
+  resolution: "@codemirror/commands@npm:0.19.4"
   dependencies:
     "@codemirror/language": ^0.19.0
     "@codemirror/matchbrackets": ^0.19.0
-    "@codemirror/state": ^0.19.0
+    "@codemirror/state": ^0.19.2
     "@codemirror/text": ^0.19.0
     "@codemirror/view": ^0.19.0
     "@lezer/common": ^0.15.0
-  checksum: d47c9e7bc1eba7c18e0745cd7f303932a058ad99b07ffb32f0bf8cb037a0a9303d7319bf94475810f647692d37d7eb5d3adfbf0e6000d46906dd62a0644ee34c
+  checksum: f223310d77ab824c18305cf6880debf358648e239fee0f97c2c7add100dc58da90fd75e98d4095c5854891daa3fa0ad8c87d6155f60b706abf2664051362da13
   languageName: node
   linkType: hard
 
@@ -1711,7 +1879,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/gutter@npm:^0.19.0, @codemirror/gutter@npm:^0.19.1":
+"@codemirror/gutter@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/gutter@npm:0.19.1"
   dependencies:
@@ -1722,7 +1890,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/highlight@npm:^0.19.0, @codemirror/highlight@npm:^0.19.4":
+"@codemirror/highlight@npm:^0.19.0":
   version: 0.19.4
   resolution: "@codemirror/highlight@npm:0.19.4"
   dependencies:
@@ -1746,7 +1914,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-cpp@npm:^0.19.1":
+"@codemirror/lang-cpp@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-cpp@npm:0.19.1"
   dependencies:
@@ -1757,7 +1925,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-css@npm:^0.19.0, @codemirror/lang-css@npm:^0.19.1":
+"@codemirror/lang-css@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-css@npm:0.19.1"
   dependencies:
@@ -1770,7 +1938,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-html@npm:^0.19.0, @codemirror/lang-html@npm:^0.19.1":
+"@codemirror/lang-html@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-html@npm:0.19.1"
   dependencies:
@@ -1786,7 +1954,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-java@npm:^0.19.1":
+"@codemirror/lang-java@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-java@npm:0.19.1"
   dependencies:
@@ -1797,7 +1965,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-javascript@npm:^0.19.0, @codemirror/lang-javascript@npm:^0.19.1":
+"@codemirror/lang-javascript@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-javascript@npm:0.19.1"
   dependencies:
@@ -1812,7 +1980,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-json@npm:^0.19.1":
+"@codemirror/lang-json@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-json@npm:0.19.1"
   dependencies:
@@ -1823,7 +1991,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-markdown@npm:^0.19.1":
+"@codemirror/lang-markdown@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-markdown@npm:0.19.1"
   dependencies:
@@ -1838,7 +2006,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-rust@npm:^0.19.1":
+"@codemirror/lang-rust@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-rust@npm:0.19.1"
   dependencies:
@@ -1849,7 +2017,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-sql@npm:^0.19.3":
+"@codemirror/lang-sql@npm:^0.19.0":
   version: 0.19.3
   resolution: "@codemirror/lang-sql@npm:0.19.3"
   dependencies:
@@ -1862,7 +2030,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-xml@npm:^0.19.1":
+"@codemirror/lang-xml@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/lang-xml@npm:0.19.1"
   dependencies:
@@ -1876,7 +2044,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/language@npm:^0.19.0, @codemirror/language@npm:^0.19.2":
+"@codemirror/language@npm:^0.19.0":
   version: 0.19.2
   resolution: "@codemirror/language@npm:0.19.2"
   dependencies:
@@ -1911,7 +2079,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/matchbrackets@npm:^0.19.0, @codemirror/matchbrackets@npm:^0.19.1":
+"@codemirror/matchbrackets@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/matchbrackets@npm:0.19.1"
   dependencies:
@@ -1954,20 +2122,20 @@ __metadata:
   linkType: hard
 
 "@codemirror/search@npm:^0.19.0":
-  version: 0.19.0
-  resolution: "@codemirror/search@npm:0.19.0"
+  version: 0.19.2
+  resolution: "@codemirror/search@npm:0.19.2"
   dependencies:
     "@codemirror/panel": ^0.19.0
     "@codemirror/rangeset": ^0.19.0
-    "@codemirror/state": ^0.19.0
+    "@codemirror/state": ^0.19.2
     "@codemirror/text": ^0.19.0
     "@codemirror/view": ^0.19.0
     crelt: ^1.0.5
-  checksum: 88751f17bcb0ccffed8ae6d78df4a48438bf2a6dc6254a90a53b2971c7af5073be7bdc5243e4621d42938ac97b060aceb68c28aa22f78f42f1266c0ede605f12
+  checksum: 67555a427fb7a9cb35266ff629f9cec0e3b5654f6813957b452e09504349ea2e021d8bb88bf6adef6908c95c7a3e850148fe0130f044486fb1ed527793592865
   languageName: node
   linkType: hard
 
-"@codemirror/state@npm:^0.19.0, @codemirror/state@npm:^0.19.1":
+"@codemirror/state@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/state@npm:0.19.1"
   dependencies:
@@ -1976,7 +2144,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/stream-parser@npm:^0.19.0, @codemirror/stream-parser@npm:^0.19.1":
+"@codemirror/state@npm:^0.19.2":
+  version: 0.19.2
+  resolution: "@codemirror/state@npm:0.19.2"
+  dependencies:
+    "@codemirror/text": ^0.19.0
+  checksum: 6460ff45d8ce20812a9abcb035a3e5f2a4adcb837c0efd00151b07c8e0bf617f6fdcf7668982b76c8e7bb447b0a83e7b8308817dac754c190c9495b49289bcaf
+  languageName: node
+  linkType: hard
+
+"@codemirror/stream-parser@npm:^0.19.0":
   version: 0.19.1
   resolution: "@codemirror/stream-parser@npm:0.19.1"
   dependencies:
@@ -1997,17 +2174,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/theme-one-dark@npm:^0.19.0":
-  version: 0.19.0
-  resolution: "@codemirror/theme-one-dark@npm:0.19.0"
-  dependencies:
-    "@codemirror/highlight": ^0.19.0
-    "@codemirror/state": ^0.19.0
-    "@codemirror/view": ^0.19.0
-  checksum: 7116d5c66bc3a12f7f05d0cd7734c62b5efb261943538ceb0220acb3444efee05737422ae1ee34a3dfdccd02b2956add2cc23cdf0d9b1db17fd66f15b2e69517
-  languageName: node
-  linkType: hard
-
 "@codemirror/tooltip@npm:^0.19.0":
   version: 0.19.2
   resolution: "@codemirror/tooltip@npm:0.19.2"
@@ -2018,7 +2184,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/view@npm:^0.19.0, @codemirror/view@npm:^0.19.4":
+"@codemirror/view@npm:^0.19.0":
   version: 0.19.4
   resolution: "@codemirror/view@npm:0.19.4"
   dependencies:
@@ -2205,15 +2371,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fortawesome/react-fontawesome@npm:^0.1.15":
-  version: 0.1.15
-  resolution: "@fortawesome/react-fontawesome@npm:0.1.15"
+"@fortawesome/react-fontawesome@npm:^0.1.16":
+  version: 0.1.16
+  resolution: "@fortawesome/react-fontawesome@npm:0.1.16"
   dependencies:
     prop-types: ^15.7.2
   peerDependencies:
-    "@fortawesome/fontawesome-svg-core": ^1.2.32
+    "@fortawesome/fontawesome-svg-core": ~1 || >=1.3.0-beta1
     react: ">=16.x"
-  checksum: 88670e1af943aed33463a258d1be7323f51ef3b50de98f0e8ae56dbd65871b77488570dd02ac6548126989c73af4d115098f12969354988992aff8c4985e92b0
+  checksum: 22e7f624ab29ef47ccd21ebc57c1b92d01596472f73fdeee860236ad4976353436d0780bdccf927f9d7b6713081e2cef7a93c88305dd330244c54408c35a6dc4
+  languageName: node
+  linkType: hard
+
+"@heroicons/react@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@heroicons/react@npm:1.0.5"
+  peerDependencies:
+    react: ">= 16"
+  checksum: 12114af19c17f69140cc7338e4cd12fe38098ad3ed79f02762106160655cde3ebdba58a2b26f1067f720786187364fd9465bc72f02aad85b0ead8172d76aa51d
   languageName: node
   linkType: hard
 
@@ -2389,14 +2564,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tailwindcss/forms@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "@tailwindcss/forms@npm:0.3.3"
+"@tailwindcss/forms@npm:^0.3.4":
+  version: 0.3.4
+  resolution: "@tailwindcss/forms@npm:0.3.4"
   dependencies:
     mini-svg-data-uri: ^1.2.3
   peerDependencies:
     tailwindcss: ">=2.0.0"
-  checksum: 6618988aae3b4d536d18a3ca6bde482024c1e0b5350549d6b530c699688b2f3e56356744e639ba4dff96d3331fc4a46c3a2d6ef6b4a3391afc5d861ffdb3c20a
+  checksum: 4b2b2b3361169bf5adf1a575c7dc8bb7946192c0edf4829e5b1de342a4e1b8138a01441a8ecef70e0777180b0797506e3f44854f09a32b9d7083658271543783
   languageName: node
   linkType: hard
 
@@ -2423,10 +2598,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/debounce@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@types/debounce@npm:1.2.0"
-  checksum: 640fd8c5e608ffa4aeaa4a88a08e4275db76ee67e35484bf9d425a52103ce5a0ca8f89ecb7051848a66f192f12c084cbccefd4647584c4f153b36122c284c062
+"@types/debounce@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@types/debounce@npm:1.2.1"
+  checksum: bea6d414acefbee50adfe87cee10f8a855d033e4778567ab03bdc3cb2648b6bf9237ca53f4ee76fe4be75f77f86d4688411499626fe409bc870f53631d24231f
   languageName: node
   linkType: hard
 
@@ -2500,10 +2675,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:^4.14.165":
-  version: 4.14.171
-  resolution: "@types/lodash@npm:4.14.171"
-  checksum: d093d8ff8b31d7829ab5f2625d824bb1f903fb07d4beca50812c99c3d6c6b63155c56eb0ecf14b97f0d4ba5fcb3b13f8259cca6d4313345326f3c48bed6f4b9f
+"@types/lodash@npm:^4.14.175":
+  version: 4.14.176
+  resolution: "@types/lodash@npm:4.14.176"
+  checksum: 9e949704dfffab60365b5cdca0477926af6eabe82c64b7be8f74b3a117bb373d58371be962c2b159dd0cf8fad49a7dcacc748564aea4ce6b6883c197a6f0bfa8
   languageName: node
   linkType: hard
 
@@ -2521,10 +2696,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^16.9.1":
-  version: 16.9.1
-  resolution: "@types/node@npm:16.9.1"
-  checksum: 41afcf183a22d59323a0199dd7e0f46591247f45fc08a4434edb26d56dc279ae4fdb80f37989ddd7a0f45e3857c4933e6e82057ede09c5a829f77e373e680375
+"@types/node@npm:^16.11.7":
+  version: 16.11.7
+  resolution: "@types/node@npm:16.11.7"
+  checksum: 2706403e6efc4aa40fdce8f0b5d9884d5600c3c8610aedc7fa5e7e298d30366f7e8b7296028d52898dca3edef4c3e827b03bf20952c4780f13fa4e79864f7a86
   languageName: node
   linkType: hard
 
@@ -2560,12 +2735,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-copy-to-clipboard@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/react-copy-to-clipboard@npm:5.0.1"
+"@types/react-copy-to-clipboard@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@types/react-copy-to-clipboard@npm:5.0.2"
   dependencies:
     "@types/react": "*"
-  checksum: 5b8252fc455191da6b236592c77cce5d2f3c0e123928e0c8dc3c39e450f0b28743dc88e3927ba0957fefd0b248dcf6feb18f6fe8a370bd8f0e3a5bb9d046e0f3
+  checksum: f2ba19587a8d56bfb54b31c716a053a263ac072f01e4bc9d64dfbcce96ff3857de279a827cf71d3a417f6bc6faf1153e6fe6d26aa05a5b6c1cb8d9b576dc226b
   languageName: node
   linkType: hard
 
@@ -2587,26 +2762,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-redux@npm:^7.1.18":
-  version: 7.1.18
-  resolution: "@types/react-redux@npm:7.1.18"
+"@types/react-redux@npm:^7.1.20":
+  version: 7.1.20
+  resolution: "@types/react-redux@npm:7.1.20"
   dependencies:
     "@types/hoist-non-react-statics": ^3.3.0
     "@types/react": "*"
     hoist-non-react-statics: ^3.3.0
     redux: ^4.0.0
-  checksum: 8aa24c15df711e2a20f903843f42491316094c3a49a90dcae86dcafa8fdb2318fdfaa983e23d67840986f11131b9b8856a5d6971288d68fa8aa592adc348a942
+  checksum: 5e0405d0d312f1b5e2dd48ab5833d3226295931fe8d276bd0891fafe4dd7ba9efbc74b1e8b30685ba96e9dc1a63d57444ae335785ce6fda96900d5fc9f800dcf
   languageName: node
   linkType: hard
 
-"@types/react-router-dom@npm:^5.1.8":
-  version: 5.1.8
-  resolution: "@types/react-router-dom@npm:5.1.8"
+"@types/react-router-dom@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "@types/react-router-dom@npm:5.3.2"
   dependencies:
     "@types/history": "*"
     "@types/react": "*"
     "@types/react-router": "*"
-  checksum: ff4af091f8e076b64f6f3f2af52429772641388393065930880e8931ce881873c2f0dff53bb1e373db5ae6b737fc514db4a1f5daa7d8bf3cf3b3088ce84472fc
+  checksum: 90f052dc5a43a77edaf41d2afa781c8ed2164cd7922b3cdf5daae446b02a2f279382425e6efc338260782c0a24d25a6101e3658acb41c8a053695968a351ea96
   languageName: node
   linkType: hard
 
@@ -2620,29 +2795,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-router@npm:^5.1.16":
-  version: 5.1.16
-  resolution: "@types/react-router@npm:5.1.16"
+"@types/react-router@npm:^5.1.17":
+  version: 5.1.17
+  resolution: "@types/react-router@npm:5.1.17"
   dependencies:
     "@types/history": "*"
     "@types/react": "*"
-  checksum: a9c04be430e7f63b17d3ac46fb5594e4089747b3004af04560cd068db136ccaedd66622f448489280cb5a94873dece69a5bc1f91c892ec5178e41ed00b78b43d
+  checksum: b9d1c7b6ce073652c39712d2b02aeec7640036e369c04be2e57e4b0eb049b64ec9f34fb91cad680ab3f794e89576f77aacadb015b61eb21500a1779e5c955b86
   languageName: node
   linkType: hard
 
-"@types/react-select@npm:^4.0.17":
-  version: 4.0.17
-  resolution: "@types/react-select@npm:4.0.17"
+"@types/react-select@npm:^4.0.18":
+  version: 4.0.18
+  resolution: "@types/react-select@npm:4.0.18"
   dependencies:
     "@emotion/serialize": ^1.0.0
     "@types/react": "*"
     "@types/react-dom": "*"
     "@types/react-transition-group": "*"
-  checksum: aa94bd1ff3536ab2bb8443bcf3c11109bcd78ae965dc534b205273eb98a84487d272e008adff50744870255e4ec5767465283649abd3d449fbc712718c062fca
+  checksum: c247c7fe45cc1d1db1fb0e5a569e288037081ed05d17f377376de82a58a5d334bb7282922ee5eaf3c30957437b028097235be81cb0bed905b3b73f9a5b8c7b58
   languageName: node
   linkType: hard
 
-"@types/react-transition-group@npm:*, @types/react-transition-group@npm:^4.4.2":
+"@types/react-transition-group@npm:*":
   version: 4.4.2
   resolution: "@types/react-transition-group@npm:4.4.2"
   dependencies:
@@ -2651,6 +2826,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react-transition-group@npm:^4.4.4":
+  version: 4.4.4
+  resolution: "@types/react-transition-group@npm:4.4.4"
+  dependencies:
+    "@types/react": "*"
+  checksum: 86e9ff9731798e12bc2afe0304678918769633b531dcf6397f86af81718fb7930ef8648e894eeb3718fc6eab6eb885cfb9b82a44d1d74e10951ee11ebc4643ae
+  languageName: node
+  linkType: hard
+
 "@types/react@npm:*":
   version: 16.9.15
   resolution: "@types/react@npm:16.9.15"
@@ -2672,14 +2856,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^16.14.15":
-  version: 16.14.15
-  resolution: "@types/react@npm:16.14.15"
+"@types/react@npm:^16.14.20":
+  version: 16.14.20
+  resolution: "@types/react@npm:16.14.20"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 7003f5c2b38b661b257d2d9dab525549f1fbcf67c2dc39fde09e65136aba9a2f80fa5c471287e629dbce01bf75574cd99f5ede82636dae75cd55111a336926c4
+  checksum: 2fc0b83ce93c4cf003832b5451a4397d6840803162ce1dea3d889c16ffb516062bc5c32f7dd17762b16b4660bc093dc6edc0d97aa5a447f43019b4331e4f760b
   languageName: node
   linkType: hard
 
@@ -2690,14 +2874,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/styled-components@npm:^5.1.14":
-  version: 5.1.14
-  resolution: "@types/styled-components@npm:5.1.14"
+"@types/styled-components@npm:^5.1.15":
+  version: 5.1.15
+  resolution: "@types/styled-components@npm:5.1.15"
   dependencies:
     "@types/hoist-non-react-statics": "*"
     "@types/react": "*"
     csstype: ^3.0.2
-  checksum: 314cc98cfdc21a608973cf5c690d335c0acaa1a9b9cf1e5714a9b073967bfbc0a7def7e9fef81b921d4017b19e39c068e189ee79ce7553f24bc714c4dd5bd430
+  checksum: d565e0a3cf3fdb79aab73c0aa2d69d93152afe2661b3ec546592b64e0781f05d21d2a9715a15acaa8422b6d6a2b1250d9ba8c96ea656776051351393bada7a82
   languageName: node
   linkType: hard
 
@@ -2708,17 +2892,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webappsec-credential-management@npm:^0.6.1":
-  version: 0.6.1
-  resolution: "@types/webappsec-credential-management@npm:0.6.1"
-  checksum: 1ed2604424b4ea391bc8e421b2c7e8ab319b4a4a008553eadd6eaecefd104500ff9230871a180d943688b9a25eeb52edd1d8b7b44b0b89f90408cdb6d403f968
+"@types/webappsec-credential-management@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@types/webappsec-credential-management@npm:0.6.2"
+  checksum: f4c95a5a5abba86bea66c26b7211c111fc0f26d3d57cd88e74912e7422d6421f54a9140d0d368c7fbcbcaa6ae5fd681b18fe94b6203d73e0ddc49d807c26b569
   languageName: node
   linkType: hard
 
-"@types/webpack-env@npm:^1.16.2":
-  version: 1.16.2
-  resolution: "@types/webpack-env@npm:1.16.2"
-  checksum: 122273f20e2bed6895aae2f03891f51ddacd826018e395d18aa5d833ad0462bb159637b83f8d202907234a6a48c66a8e4e9fdd703afc66f6afddb83eeac82b13
+"@types/webpack-env@npm:^1.16.3":
+  version: 1.16.3
+  resolution: "@types/webpack-env@npm:1.16.3"
+  checksum: faefa7c0a75289fb469b9a5ae44059a00009de840e0e62d13b3f837d77647da76808e7839cdc414b8c585969cf6b6a7f290dc2cb437a9ccdf04cb214c68f3223
   languageName: node
   linkType: hard
 
@@ -2729,14 +2913,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:4.30.0"
+"@typescript-eslint/eslint-plugin@npm:^4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:4.33.0"
   dependencies:
-    "@typescript-eslint/experimental-utils": 4.30.0
-    "@typescript-eslint/scope-manager": 4.30.0
+    "@typescript-eslint/experimental-utils": 4.33.0
+    "@typescript-eslint/scope-manager": 4.33.0
     debug: ^4.3.1
     functional-red-black-tree: ^1.0.1
+    ignore: ^5.1.8
     regexpp: ^3.1.0
     semver: ^7.3.5
     tsutils: ^3.21.0
@@ -2746,66 +2931,66 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 131079d73537d960e8bfbf56df9687e0eaa9b0b6791a029d2f4fd367ebe8db56086361e5ebff74be95bef40855f1dd3f9145bd1b02d48e547a9896256e4648f7
+  checksum: d74855d0a5ffe0b2f362ec02fcd9301d39a53fb4155b9bd0cb15a0a31d065143129ebf98df9d86af4b6f74de1d423a4c0d8c0095520844068117453afda5bc4f
   languageName: node
   linkType: hard
 
-"@typescript-eslint/experimental-utils@npm:4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/experimental-utils@npm:4.30.0"
+"@typescript-eslint/experimental-utils@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/experimental-utils@npm:4.33.0"
   dependencies:
     "@types/json-schema": ^7.0.7
-    "@typescript-eslint/scope-manager": 4.30.0
-    "@typescript-eslint/types": 4.30.0
-    "@typescript-eslint/typescript-estree": 4.30.0
+    "@typescript-eslint/scope-manager": 4.33.0
+    "@typescript-eslint/types": 4.33.0
+    "@typescript-eslint/typescript-estree": 4.33.0
     eslint-scope: ^5.1.1
     eslint-utils: ^3.0.0
   peerDependencies:
     eslint: "*"
-  checksum: 2f63ec6a463edd4e41669febb16160590044a4a065b3d9badebcbe97b1725d1264390135cfe5cc3deb567df7b086f810763b761eddca5d901b9bdf1a462b03b3
+  checksum: f859800ada0884f92db6856f24efcb1d073ac9883ddc2b1aa9339f392215487895bed8447ebce3741e8141bb32e545244abef62b73193ba9a8a0527c523aabae
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/parser@npm:4.30.0"
+"@typescript-eslint/parser@npm:^4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/parser@npm:4.33.0"
   dependencies:
-    "@typescript-eslint/scope-manager": 4.30.0
-    "@typescript-eslint/types": 4.30.0
-    "@typescript-eslint/typescript-estree": 4.30.0
+    "@typescript-eslint/scope-manager": 4.33.0
+    "@typescript-eslint/types": 4.33.0
+    "@typescript-eslint/typescript-estree": 4.33.0
     debug: ^4.3.1
   peerDependencies:
     eslint: ^5.0.0 || ^6.0.0 || ^7.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: aed2048c5eade38a57db50f551245b72cd460c3f8c38f51f3b62ce7715d43b691a91bf277b0a4f5b5e0383fb5d8a93ff0501187e2454eb6d128da34ef802e3ab
+  checksum: 102457eae1acd516211098fea081c8a2ed728522bbda7f5a557b6ef23d88970514f9a0f6285d53fca134d3d4d7d17822b5d5e12438d5918df4d1f89cc9e67d57
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/scope-manager@npm:4.30.0"
+"@typescript-eslint/scope-manager@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/scope-manager@npm:4.33.0"
   dependencies:
-    "@typescript-eslint/types": 4.30.0
-    "@typescript-eslint/visitor-keys": 4.30.0
-  checksum: 7756f13cb5fc103e61c765ad8d15249804cec8c13c2051a63c0d543307ab178052f5bcb4a19cb50df281b4097b728f33ba92c83b670a091a51a69795ac8e3b86
+    "@typescript-eslint/types": 4.33.0
+    "@typescript-eslint/visitor-keys": 4.33.0
+  checksum: 9a25fb7ba7c725ea7227a24d315b0f6aacbad002e2549a049edf723c1d3615c22f5c301f0d7d615b377f2cdf2f3519d97e79af0c459de6ef8d2aaf0906dff13e
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/types@npm:4.30.0"
-  checksum: 1be5c9a30c1e552b5b215fe1ca38f3ac48ea68a06c103eb498d3a987b8cbdbe4770992d4498ab28e216fa9b2d2806ee3c856cc97cbca1a7f01e8032537bd6bef
+"@typescript-eslint/types@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/types@npm:4.33.0"
+  checksum: 3baae1ca35872421b4eb60f5d3f3f32dc1d513f2ae0a67dee28c7d159fd7a43ed0d11a8a5a0f0c2d38507ffa036fc7c511cb0f18a5e8ac524b3ebde77390ec53
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/typescript-estree@npm:4.30.0"
+"@typescript-eslint/typescript-estree@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/typescript-estree@npm:4.33.0"
   dependencies:
-    "@typescript-eslint/types": 4.30.0
-    "@typescript-eslint/visitor-keys": 4.30.0
+    "@typescript-eslint/types": 4.33.0
+    "@typescript-eslint/visitor-keys": 4.33.0
     debug: ^4.3.1
     globby: ^11.0.3
     is-glob: ^4.0.1
@@ -2814,17 +2999,17 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: e35410e33b5afc010f8bde683f4fd4f9fbe3ad821e916eb5ff1ed23943e6202a817a4cb21eb8e697a55f01182ceecaca1731cb98791d767f7fe67b11f84f3d67
+  checksum: 2566984390c76bd95f43240057215c068c69769e406e27aba41e9f21fd300074d6772e4983fa58fe61e80eb5550af1548d2e31e80550d92ba1d051bb00fe6f5c
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:4.30.0":
-  version: 4.30.0
-  resolution: "@typescript-eslint/visitor-keys@npm:4.30.0"
+"@typescript-eslint/visitor-keys@npm:4.33.0":
+  version: 4.33.0
+  resolution: "@typescript-eslint/visitor-keys@npm:4.33.0"
   dependencies:
-    "@typescript-eslint/types": 4.30.0
+    "@typescript-eslint/types": 4.33.0
     eslint-visitor-keys: ^2.0.0
-  checksum: b825d1340c3209390c39b31f67c995b5a25db716088822c5d056889b700fffb4cd9acb89d75a26db034e52fdbc67d0f7fbfc03ce502f52bcd300ce2379a9aaac
+  checksum: 59953e474ad4610c1aa23b2b1a964445e2c6201521da6367752f37939d854352bbfced5c04ea539274065e012b1337ba3ffa49c2647a240a4e87155378ba9873
   languageName: node
   linkType: hard
 
@@ -3399,7 +3584,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.2, array-includes@npm:^3.1.3":
+"array-includes@npm:^3.1.2":
   version: 3.1.3
   resolution: "array-includes@npm:3.1.3"
   dependencies:
@@ -3412,6 +3597,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-includes@npm:^3.1.4":
+  version: 3.1.4
+  resolution: "array-includes@npm:3.1.4"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.1.3
+    es-abstract: ^1.19.1
+    get-intrinsic: ^1.1.1
+    is-string: ^1.0.7
+  checksum: 69967c38c52698f84b50a7aed5554aadc89c6ac6399b6d92ad061a5952f8423b4bba054c51d40963f791dfa294d7247cdd7988b6b1f2c5861477031c6386e1c0
+  languageName: node
+  linkType: hard
+
 "array-union@npm:^1.0.1":
   version: 1.0.2
   resolution: "array-union@npm:1.0.2"
@@ -3442,26 +3640,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "array.prototype.flat@npm:1.2.4"
+"array.prototype.flat@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.flat@npm:1.2.5"
   dependencies:
-    call-bind: ^1.0.0
+    call-bind: ^1.0.2
     define-properties: ^1.1.3
-    es-abstract: ^1.18.0-next.1
-  checksum: 1ec5d9887ae45e70e4b993e801b440ae5ddcd0d2c6d1dbe214c311e91436152f510916bdac82b066693544b9801a3c510dfbec8a278ababf8de7eb0bde74636f
+    es-abstract: ^1.19.0
+  checksum: 9cc6414b111abfc7717e39546e4887b1e5ec74df8f1618d83425deaa95752bf05d475d1d241253b4d88d4a01f8e1bc84845ad5b7cc2047f8db2f614512acd40e
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "array.prototype.flatmap@npm:1.2.4"
+"array.prototype.flatmap@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.flatmap@npm:1.2.5"
   dependencies:
     call-bind: ^1.0.0
     define-properties: ^1.1.3
-    es-abstract: ^1.18.0-next.1
-    function-bind: ^1.1.1
-  checksum: 1d32ec6747611e88a5f55b49df0fb38d1d6a3824e451b760a1b7ca87d22874f638d784a6dbdd2b7eba01d7dea6e48e2cce4848bd2e8b48f1f53013605ddef08b
+    es-abstract: ^1.19.0
+  checksum: a14119a28e5687a13cf3fd6756a8e7810563a9e81cd4227e27a25c31d362df47ac72553f06a271fd728741e199047933ad43d561d64a28da0b4e1a26f74e939e
   languageName: node
   linkType: hard
 
@@ -3556,21 +3753,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.3.4":
-  version: 10.3.4
-  resolution: "autoprefixer@npm:10.3.4"
+"autoprefixer@npm:^10.4.0":
+  version: 10.4.0
+  resolution: "autoprefixer@npm:10.4.0"
   dependencies:
-    browserslist: ^4.16.8
-    caniuse-lite: ^1.0.30001252
-    colorette: ^1.3.0
+    browserslist: ^4.17.5
+    caniuse-lite: ^1.0.30001272
     fraction.js: ^4.1.1
     normalize-range: ^0.1.2
+    picocolors: ^1.0.0
     postcss-value-parser: ^4.1.0
   peerDependencies:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: fa037d78767158f3fd9b30e27870590824bddc7e38ffadf22b697e1a9d23b32cb4a164bef01e94b7820c8d719117ca5028db1764855fb6146fb2776d7bffe0e9
+  checksum: 7d511c64daeaa13c7888b40b0394cd891fab1852a1f60165330c9e49ab70ac29ad1e3386665d86361661cf2bbe90cea42b78ea73cb77b373ffe30a8f4973a955
   languageName: node
   linkType: hard
 
@@ -3583,9 +3780,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:^8.2.2":
-  version: 8.2.2
-  resolution: "babel-loader@npm:8.2.2"
+"babel-loader@npm:^8.2.3":
+  version: 8.2.3
+  resolution: "babel-loader@npm:8.2.3"
   dependencies:
     find-cache-dir: ^3.3.1
     loader-utils: ^1.4.0
@@ -3594,7 +3791,7 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.0.0
     webpack: ">=2"
-  checksum: df5092ef9886bb49aacb7c58ac40ed0681ced031c8d91e49d680cedace2aa1703390a31fbe7c0e409f739836e911c5c991119133d90d9289f681c0a8ff2447a1
+  checksum: 78e1e1a91954d644b6ce66366834d4d245febbc0fde33e4e2831725e83d6e760d12b3a78e9534ce92af69067bef1d9d9674df36d8c1f20ee127bc2354b2203ba
   languageName: node
   linkType: hard
 
@@ -3629,43 +3826,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.2.2"
+"babel-plugin-polyfill-corejs2@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.2.3"
   dependencies:
     "@babel/compat-data": ^7.13.11
-    "@babel/helper-define-polyfill-provider": ^0.2.2
+    "@babel/helper-define-polyfill-provider": ^0.2.4
     semver: ^6.1.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: eee45ecce743e06840d29936a7f4a9f9eca19552ba010e9f3676c6a2697ab815230f39953296b72f09665de0e8fffe260e52b348011a9ddba36cfa7eec6f8c51
+  checksum: a379fdb5aa046fb96516796afb50888bd22de1590fbdaed15c613910f3208500e705dd2a605fb30c0bb8b3191ee9ba9c10b3f46121e0507bf396186941056090
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.2.2":
+"babel-plugin-polyfill-corejs3@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.3.0"
+  dependencies:
+    "@babel/helper-define-polyfill-provider": ^0.2.4
+    core-js-compat: ^3.18.0
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: bef217415448dea6af38ac4ce70e0fad897577fe764711a47030beee191848a47a9fdd9e1b222ef428c8fc0b792cdb8750aaddb3fa5624feccb64b6926ac57b4
+  languageName: node
+  linkType: hard
+
+"babel-plugin-polyfill-regenerator@npm:^0.2.3":
   version: 0.2.3
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.2.3"
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.2.3"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.2.2
-    core-js-compat: ^3.14.0
+    "@babel/helper-define-polyfill-provider": ^0.2.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e390c5317b35808633d32db2c1718aef6af788df148adc6fa54e56d2266896ad2da2d200163f392e06ae1ebd1a0feaeaf18d7a337dea70387429618898b90a68
+  checksum: 81be5914f241d785abdfa3b5fc9005792b1b675e3e0a48bbc12db25b49e965985a500fc2008c8026ec7625a757d6d43aa44a75369fece1a413bd9863369e5a9c
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.2.2"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.2.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3e32e318fd91d65c3af2bb363189f00d3839f07a73a08813b553553e07da205162091b428dd5b6ffb6ea4caf531ff43ebc54197b0a5a9dc2fc5c7e9a650e946d
-  languageName: node
-  linkType: hard
-
-"babel-plugin-styled-components@npm:>= 1.12.0, babel-plugin-styled-components@npm:^1.13.2":
+"babel-plugin-styled-components@npm:>= 1.12.0":
   version: 1.13.2
   resolution: "babel-plugin-styled-components@npm:1.13.2"
   dependencies:
@@ -3679,6 +3876,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"babel-plugin-styled-components@npm:^1.13.3":
+  version: 1.13.3
+  resolution: "babel-plugin-styled-components@npm:1.13.3"
+  dependencies:
+    "@babel/helper-annotate-as-pure": ^7.15.4
+    "@babel/helper-module-imports": ^7.15.4
+    babel-plugin-syntax-jsx: ^6.18.0
+    lodash: ^4.17.11
+  peerDependencies:
+    styled-components: ">= 2"
+  checksum: 265520afd1c1e6633cd796446725b57f3d9eac6abb1d506c0399c34792f6f8a954865c2908cb24703fdf6c06aab8136e2a5098c53a0c7fb744bbdceaf3d5081b
+  languageName: node
+  linkType: hard
+
 "babel-plugin-syntax-jsx@npm:^6.18.0":
   version: 6.18.0
   resolution: "babel-plugin-syntax-jsx@npm:6.18.0"
@@ -3928,18 +4139,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.16.8, browserslist@npm:^4.17.0":
-  version: 4.17.0
-  resolution: "browserslist@npm:4.17.0"
+"browserslist@npm:^4.17.5, browserslist@npm:^4.17.6":
+  version: 4.17.6
+  resolution: "browserslist@npm:4.17.6"
   dependencies:
-    caniuse-lite: ^1.0.30001254
-    colorette: ^1.3.0
-    electron-to-chromium: ^1.3.830
+    caniuse-lite: ^1.0.30001274
+    electron-to-chromium: ^1.3.886
     escalade: ^3.1.1
-    node-releases: ^1.1.75
+    node-releases: ^2.0.1
+    picocolors: ^1.0.0
   bin:
     browserslist: cli.js
-  checksum: 9b45ec283d7ba1513bd8be6143dadb34a65e8be7f7210b3a2bce947e019184408df6126238e54f8061e9be74362b19d04eaba739b3ee0d5d41d57ac0ae5fe4cd
+  checksum: 7191280a30621dcb9b285f7f22c462aacbd366a94fcacdac109b8fa1a2fdab826b6545ccb308ad40f5d80f4fc488ae1212af8b16342286b97a1418476a98f77c
   languageName: node
   linkType: hard
 
@@ -4106,10 +4317,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001252, caniuse-lite@npm:^1.0.30001254":
-  version: 1.0.30001254
-  resolution: "caniuse-lite@npm:1.0.30001254"
-  checksum: 7dd89bbc5c2c202dd120f3dc5f5446cf0e0711edfe0d603456e8d7c4df3973c34587c8a427f92e75be80c30e4ee730e3d309e555adddcce570ffe27a1ad18134
+"caniuse-lite@npm:^1.0.30001272, caniuse-lite@npm:^1.0.30001274":
+  version: 1.0.30001280
+  resolution: "caniuse-lite@npm:1.0.30001280"
+  checksum: 5794b22f4254927f095e83c65e89ddfc63065c7ed16e6544555a3252ee3d16e48f8a7846713dc64869c52e1abe9a2a93161804b40c2097d1abc9aaa0155a0b65
   languageName: node
   linkType: hard
 
@@ -4430,13 +4641,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "colorette@npm:1.3.0"
-  checksum: bda403dfba4d032bee4169f2a6436a83ae3da488a53bcb3be92dc44ace056518245cc614b12429d7529493d6b090a119b2523b0d55e8cd6b81ad939a3003c008
-  languageName: node
-  linkType: hard
-
 "commander@npm:^2.20.0":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -4607,13 +4811,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.14.0, core-js-compat@npm:^3.15.0":
-  version: 3.15.2
-  resolution: "core-js-compat@npm:3.15.2"
+"core-js-compat@npm:^3.18.0, core-js-compat@npm:^3.19.0":
+  version: 3.19.1
+  resolution: "core-js-compat@npm:3.19.1"
   dependencies:
-    browserslist: ^4.16.6
+    browserslist: ^4.17.6
     semver: 7.0.0
-  checksum: ca68b51b4a75241dae44ae75bf01476c0c8505c1c6fe69dc3b3ae3ee0e8d39fadf415df21a2c46ea018c250aa76ba1a664e8cb2b6657a801eed1a2ac738d7968
+  checksum: ed302c99814bd7227b549f639fe5f1a3b9d885c0f878c1203f10be0a33c7d0b199931cb904074cc988ab48411132d4f41adf1603e4eebe5c5d42bdc62a3f5c5d
   languageName: node
   linkType: hard
 
@@ -4842,10 +5046,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^2.23.0":
-  version: 2.23.0
-  resolution: "date-fns@npm:2.23.0"
-  checksum: 485216d550255a548552db16379e7a5cd440e262b90fbdc0362f63ee71d0e74bd00ce29ca8d76b343f6df36c1ecb6f22edba0b72848a4c32674e755619695c1f
+"date-fns@npm:^2.25.0":
+  version: 2.25.0
+  resolution: "date-fns@npm:2.25.0"
+  checksum: 8896dc1dde0ee5ef77616942423bfa11fa2017a5ac19457293b7aaedc8822ff94f0a14eaf93da573b09b601dc0149eb430988a046cc9f79a2eb15f8c66c9c50c
   languageName: node
   linkType: hard
 
@@ -5250,18 +5454,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"easy-peasy@npm:^5.0.3":
-  version: 5.0.3
-  resolution: "easy-peasy@npm:5.0.3"
+"easy-peasy@npm:^5.0.4":
+  version: 5.0.4
+  resolution: "easy-peasy@npm:5.0.4"
   dependencies:
-    "@babel/runtime": ^7.13.8
-    immer: ^8.0.1
-    redux: ^4.0.5
+    "@babel/runtime": ^7.15.4
+    immer: ^9.0.6
+    redux: ^4.1.1
     redux-thunk: ^2.3.0
-    ts-toolbelt: ^9.3.12
+    ts-toolbelt: ^9.6.0
   peerDependencies:
     react: ">= 16.8.0"
-  checksum: 0e10ba19060840cf86a51ac91829fd2e8ffc02ff47f818f67dc0cf122f8adb073b85a6ce5a80347254ae354b43423b16b3cc5142a532d1434a3234465dee50d0
+  checksum: 5cdc006a51ca92a4399bb4c6993cc69c3dc4ab73a202c973ddf22398c01a20dd96a936af3b69ecc8dff403738be4fef1517d95da3ac1193f7eec4188839bc436
   languageName: node
   linkType: hard
 
@@ -5279,10 +5483,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.3.830":
-  version: 1.3.830
-  resolution: "electron-to-chromium@npm:1.3.830"
-  checksum: e231140e0dc0f548a5b531d02cedf80d6aadf715472785b684eb8877137cb72b571638585fd709ce450d410701a9b83e1eda134224a37dab1d39b52156ed3382
+"electron-to-chromium@npm:^1.3.886":
+  version: 1.3.896
+  resolution: "electron-to-chromium@npm:1.3.896"
+  checksum: 6a6120bc6d2c53c57409831e0acd4c9d2c3c18e30851b3c9278bce9a4ad24ce7781fbc0fe735926aea358875ab5b10f32208df865a1c42ca565108f55b6e4aae
   languageName: node
   linkType: hard
 
@@ -5408,7 +5612,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.18.0-next.1, es-abstract@npm:^1.18.0-next.2, es-abstract@npm:^1.18.2":
+"es-abstract@npm:^1.18.0-next.2":
   version: 1.18.3
   resolution: "es-abstract@npm:1.18.3"
   dependencies:
@@ -5432,6 +5636,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1":
+  version: 1.19.1
+  resolution: "es-abstract@npm:1.19.1"
+  dependencies:
+    call-bind: ^1.0.2
+    es-to-primitive: ^1.2.1
+    function-bind: ^1.1.1
+    get-intrinsic: ^1.1.1
+    get-symbol-description: ^1.0.0
+    has: ^1.0.3
+    has-symbols: ^1.0.2
+    internal-slot: ^1.0.3
+    is-callable: ^1.2.4
+    is-negative-zero: ^2.0.1
+    is-regex: ^1.1.4
+    is-shared-array-buffer: ^1.0.1
+    is-string: ^1.0.7
+    is-weakref: ^1.0.1
+    object-inspect: ^1.11.0
+    object-keys: ^1.1.1
+    object.assign: ^4.1.2
+    string.prototype.trimend: ^1.0.4
+    string.prototype.trimstart: ^1.0.4
+    unbox-primitive: ^1.0.1
+  checksum: b6be8410672c5364db3fb01eb786e30c7b4bb32b4af63d381c08840f4382c4a168e7855cd338bf59d4f1a1a1138f4d748d1fd40ec65aaa071876f9e9fbfed949
+  languageName: node
+  linkType: hard
+
 "es-to-primitive@npm:^1.2.1":
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
@@ -5483,23 +5715,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-node@npm:^0.3.4":
-  version: 0.3.4
-  resolution: "eslint-import-resolver-node@npm:0.3.4"
+"eslint-import-resolver-node@npm:^0.3.6":
+  version: 0.3.6
+  resolution: "eslint-import-resolver-node@npm:0.3.6"
   dependencies:
-    debug: ^2.6.9
-    resolve: ^1.13.1
-  checksum: a0db55ec26c5bb385c8681af6b8d6dee16768d5f27dff72c3113407d0f028f28e56dcb1cc3a4689c79396a5f6a9c24bd0cac9a2c9c588c7d7357d24a42bec876
+    debug: ^3.2.7
+    resolve: ^1.20.0
+  checksum: 6266733af1e112970e855a5bcc2d2058fb5ae16ad2a6d400705a86b29552b36131ffc5581b744c23d550de844206fb55e9193691619ee4dbf225c4bde526b1c8
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "eslint-module-utils@npm:2.6.1"
+"eslint-module-utils@npm:^2.7.1":
+  version: 2.7.1
+  resolution: "eslint-module-utils@npm:2.7.1"
   dependencies:
     debug: ^3.2.7
+    find-up: ^2.1.0
     pkg-dir: ^2.0.0
-  checksum: 3cc43a36a0075d300db6a3946203ec92249b6da1539694ef205a43b4ccfbc2eaf4961475d4b89c24b12c187d6bfd882c7c7d0b2ce02adb40c2dedb7fd022a7e2
+  checksum: c30dfa125aafe65e5f6a30a31c26932106fcf09934a2f47d7f8a393ed9106da7b07416f2337b55c85f9db0175c873ee0827be5429a24ec381b49940f342b9ac3
   languageName: node
   linkType: hard
 
@@ -5515,28 +5748,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:^2.23.4":
-  version: 2.23.4
-  resolution: "eslint-plugin-import@npm:2.23.4"
+"eslint-plugin-import@npm:^2.25.3":
+  version: 2.25.3
+  resolution: "eslint-plugin-import@npm:2.25.3"
   dependencies:
-    array-includes: ^3.1.3
-    array.prototype.flat: ^1.2.4
+    array-includes: ^3.1.4
+    array.prototype.flat: ^1.2.5
     debug: ^2.6.9
     doctrine: ^2.1.0
-    eslint-import-resolver-node: ^0.3.4
-    eslint-module-utils: ^2.6.1
-    find-up: ^2.0.0
+    eslint-import-resolver-node: ^0.3.6
+    eslint-module-utils: ^2.7.1
     has: ^1.0.3
-    is-core-module: ^2.4.0
+    is-core-module: ^2.8.0
+    is-glob: ^4.0.3
     minimatch: ^3.0.4
-    object.values: ^1.1.3
-    pkg-up: ^2.0.0
-    read-pkg-up: ^3.0.0
+    object.values: ^1.1.5
     resolve: ^1.20.0
-    tsconfig-paths: ^3.9.0
+    tsconfig-paths: ^3.11.0
   peerDependencies:
-    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0
-  checksum: 8c64bb96fa35607de3da1ddf5d127a5913aebde5677bc276c55fecb3e539a7287569dc697af4f5c523bd2b08bff8f5b525448df5aa7d6256c86436b615be5abc
+    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
+  checksum: 8bdf4b1fafb0e5c8f57a1673f72d84307d32c06a23942990d198c8b32a85a5ae0098872d1ef5bf80d7dfe8ec542f6a671e3c5e706731a80b493c9015f7a147f5
   languageName: node
   linkType: hard
 
@@ -5556,43 +5787,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-promise@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "eslint-plugin-promise@npm:5.1.0"
+"eslint-plugin-promise@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "eslint-plugin-promise@npm:5.1.1"
   peerDependencies:
     eslint: ^7.0.0
-  checksum: e62947aaea6882951a1a9f5fe3e3c7925b8dcc222338f7979bd1495ba0f0dc701820116b108be1e801f6e5156eb9a928142f29c659fd21a5d65a4be495bb327d
+  checksum: 97ffd570265ed9677b4103ba3fb18b19fa3471eb6581c5c3c426bcec249c9e89cfac735e5ddb403a794cab7fda1b53be151a30e1d3b71485630d7f28e1bb1ad6
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "eslint-plugin-react-hooks@npm:4.2.0"
+"eslint-plugin-react-hooks@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "eslint-plugin-react-hooks@npm:4.3.0"
   peerDependencies:
-    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
-  checksum: ead5c5be3ded82a0cf295b064376adb1998a43e2262b605eecc0efc88283dec4e159ca39307fafb3d8e661dd08e5a4c8cdfed97eea78f923954f72bad6e20397
+    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
+  checksum: 0ba1566ba0780bbc75a5921f49188edf232db2085ab32c8d3889592f0db9d6fadc97fcf639775e0101dec6b5409ca3c803ec44213b90c8bacaf0bdf921871c2e
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.24.0":
-  version: 7.24.0
-  resolution: "eslint-plugin-react@npm:7.24.0"
+"eslint-plugin-react@npm:^7.27.0":
+  version: 7.27.0
+  resolution: "eslint-plugin-react@npm:7.27.0"
   dependencies:
-    array-includes: ^3.1.3
-    array.prototype.flatmap: ^1.2.4
+    array-includes: ^3.1.4
+    array.prototype.flatmap: ^1.2.5
     doctrine: ^2.1.0
-    has: ^1.0.3
+    estraverse: ^5.3.0
     jsx-ast-utils: ^2.4.1 || ^3.0.0
     minimatch: ^3.0.4
-    object.entries: ^1.1.4
-    object.fromentries: ^2.0.4
-    object.values: ^1.1.4
+    object.entries: ^1.1.5
+    object.fromentries: ^2.0.5
+    object.hasown: ^1.1.0
+    object.values: ^1.1.5
     prop-types: ^15.7.2
     resolve: ^2.0.0-next.3
-    string.prototype.matchall: ^4.0.5
+    semver: ^6.3.0
+    string.prototype.matchall: ^4.0.6
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7
-  checksum: bf844f98d93f3617fbd03df4be4f4c9e8e49ea035678762b73a28df730e9518d5ac636293f6326b41b4a0678f9dfa059ce559f6652c7a2d914d477ec3a389619
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+  checksum: 47d75e003898129a56ca2416d3aa038b4c4a752df3edf71174c3017788eb8b83d786091fc6c3702abf870a2abe5d25cc367d5aa7c1417153cf5b5b707aec6446
   languageName: node
   linkType: hard
 
@@ -5776,6 +6009,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"estraverse@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "estraverse@npm:5.3.0"
+  checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
+  languageName: node
+  linkType: hard
+
 "esutils@npm:^2.0.2":
   version: 2.0.2
   resolution: "esutils@npm:2.0.2"
@@ -6115,7 +6355,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-up@npm:^2.0.0, find-up@npm:^2.1.0":
+"find-up@npm:^2.1.0":
   version: 2.1.0
   resolution: "find-up@npm:2.1.0"
   dependencies:
@@ -6215,9 +6455,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fork-ts-checker-webpack-plugin@npm:^6.3.3":
-  version: 6.3.3
-  resolution: "fork-ts-checker-webpack-plugin@npm:6.3.3"
+"fork-ts-checker-webpack-plugin@npm:^6.4.0":
+  version: 6.4.0
+  resolution: "fork-ts-checker-webpack-plugin@npm:6.4.0"
   dependencies:
     "@babel/code-frame": ^7.8.3
     "@types/json-schema": ^7.0.5
@@ -6232,7 +6472,17 @@ __metadata:
     schema-utils: 2.7.0
     semver: ^7.3.2
     tapable: ^1.0.0
-  checksum: 22bcbf08fc6c1d31daa521e4b59495ee0e4ec51a7e5728dfd4212835f461002a92910b0bc1a1c62cfe569f7b907fdb81875f108ee922113050deca042f06df8d
+  peerDependencies:
+    eslint: ">= 6"
+    typescript: ">= 2.7"
+    vue-template-compiler: "*"
+    webpack: ">= 4"
+  peerDependenciesMeta:
+    eslint:
+      optional: true
+    vue-template-compiler:
+      optional: true
+  checksum: feba541453d4bdeaa743388541e125204789369920909f0152b11cfd1801a75fb2f6c708eae0174c9810ab4334fa21dea761037629440a647046581e7df62b8c
   languageName: node
   linkType: hard
 
@@ -6376,7 +6626,7 @@ fsevents@^1.2.7:
   dependencies:
     nan: ^2.9.2
     node-pre-gyp: ^0.10.0
-  checksum: 4b49b2de89a358a52e6c2db76113a22a99a803d10fb6f452a9e8708052ee9f2f1947c1ccb9940ef238036e05d8ade3875c569458a670d4a73bf3c920d04c4483
+  checksum: b31f577c1aac62e6e51df61e243b74fd5e9e157bb5c99a248b64f0b99940dcbcc1a7d693f880eec5195fbf1fbb91ccb39f1ddcaf0b10e835bc12bad8950a4098
   languageName: node
   linkType: hard
 
@@ -6385,7 +6635,7 @@ fsevents@^1.2.7:
   resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=1cc4b2"
   dependencies:
     node-gyp: latest
-  checksum: b5712ac3858d8f77dbbf9f19e0c7f4a9aa0b336416a814be49d846d076c4f2fe4b7bf69846be8b7c9b23319c318e157f4cd5eb0eefcca015632fe7bfd82a34d8
+  checksum: 78db9daf1f6526a49cefee3917cc988f62dc7f25b5dd80ad6de4ffc4af7f0cab7491ac737626ff53e482a111bc53aac9e411fe3602458eca36f6a003ecf69c16
   languageName: node
   linkType: hard
 
@@ -6462,6 +6712,16 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"get-symbol-description@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "get-symbol-description@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.1
+  checksum: 9ceff8fe968f9270a37a1f73bf3f1f7bda69ca80f4f80850670e0e7b9444ff99323f7ac52f96567f8b5f5fbe7ac717a0d81d3407c7313e82810c6199446a5247
+  languageName: node
+  linkType: hard
+
 "get-value@npm:^2.0.3, get-value@npm:^2.0.6":
   version: 2.0.6
   resolution: "get-value@npm:2.0.6"
@@ -6733,6 +6993,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"has-tostringtag@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-tostringtag@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.2
+  checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c
+  languageName: node
+  linkType: hard
+
 "has-unicode@npm:^2.0.0":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
@@ -6874,13 +7143,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^2.1.4":
-  version: 2.8.8
-  resolution: "hosted-git-info@npm:2.8.8"
-  checksum: fc5bdbd1ce2597c7fe43cf905ae18c7f96a8e042a46340af4cc4e5a0497d4a0669e2ac5ebc16bc0fef98eb8fe5d55b9b467d3aa97b97f0a87d7673644af31c74
-  languageName: node
-  linkType: hard
-
 "hpack.js@npm:^2.1.6":
   version: 2.1.6
   resolution: "hpack.js@npm:2.1.6"
@@ -7149,10 +7411,17 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"immer@npm:^8.0.1":
-  version: 8.0.4
-  resolution: "immer@npm:8.0.4"
-  checksum: 9d3b28df1ac5bf6918c611e71c15bdb136588c21a3431100448f21325fef9b055cc9a44fe8b023f0c5ecbc66a2ba38f403c9a67d581f613b49d0e4ff15564f79
+"ignore@npm:^5.1.8":
+  version: 5.1.9
+  resolution: "ignore@npm:5.1.9"
+  checksum: 6f6b2235f4e63648116c5814f76b2d3d63fae9c21b8a466862e865732f59e787c9938a9042f9457091db6f0d811508ea3c8c6a60f35bafc4ceea08bbe8f96fd5
+  languageName: node
+  linkType: hard
+
+"immer@npm:^9.0.6":
+  version: 9.0.6
+  resolution: "immer@npm:9.0.6"
+  checksum: 75da22f3b32f3f14604eb389b4f50e84a14f2e42f306f0cbe4d2969aed54ec7fda9a7e9ca42ebae2ba73ec9bb6ec1001fafbac535accaf03860054ab0f7e8388
   languageName: node
   linkType: hard
 
@@ -7439,7 +7708,14 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.2.0, is-core-module@npm:^2.4.0":
+"is-callable@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "is-callable@npm:1.2.4"
+  checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f
+  languageName: node
+  linkType: hard
+
+"is-core-module@npm:^2.2.0":
   version: 2.4.0
   resolution: "is-core-module@npm:2.4.0"
   dependencies:
@@ -7448,6 +7724,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"is-core-module@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "is-core-module@npm:2.8.0"
+  dependencies:
+    has: ^1.0.3
+  checksum: f8b52714891e1a6c6577fcb8d5e057bab064a7a30954aab6beb5092e311473eb8da57afd334de4981dc32409ffca998412efc3a2edceb9e397cef6098d21dd91
+  languageName: node
+  linkType: hard
+
 "is-data-descriptor@npm:^0.1.4":
   version: 0.1.4
   resolution: "is-data-descriptor@npm:0.1.4"
@@ -7568,6 +7853,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"is-glob@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "is-glob@npm:4.0.3"
+  dependencies:
+    is-extglob: ^2.1.1
+  checksum: d381c1319fcb69d341cc6e6c7cd588e17cd94722d9a32dbd60660b993c4fb7d0f19438674e68dfec686d09b7c73139c9166b47597f846af387450224a8101ab4
+  languageName: node
+  linkType: hard
+
 "is-lambda@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-lambda@npm:1.0.1"
@@ -7665,6 +7959,23 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"is-regex@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "is-regex@npm:1.1.4"
+  dependencies:
+    call-bind: ^1.0.2
+    has-tostringtag: ^1.0.0
+  checksum: 362399b33535bc8f386d96c45c9feb04cf7f8b41c182f54174c1a45c9abbbe5e31290bbad09a458583ff6bf3b2048672cdb1881b13289569a7c548370856a652
+  languageName: node
+  linkType: hard
+
+"is-shared-array-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-shared-array-buffer@npm:1.0.1"
+  checksum: 2ffb92533e64e2876e6cfe6906871d28400b6f1a53130fe652ec8007bc0e5044d05e7af8e31bdc992fbba520bd92938cfbeedd0f286be92f250c7c76191c4d90
+  languageName: node
+  linkType: hard
+
 "is-stream@npm:^1.1.0":
   version: 1.1.0
   resolution: "is-stream@npm:1.1.0"
@@ -7686,6 +7997,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"is-string@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "is-string@npm:1.0.7"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: 323b3d04622f78d45077cf89aab783b2f49d24dc641aa89b5ad1a72114cfeff2585efc8c12ef42466dff32bde93d839ad321b26884cf75e5a7892a938b089989
+  languageName: node
+  linkType: hard
+
 "is-symbol@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-symbol@npm:1.0.2"
@@ -7704,6 +8024,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"is-weakref@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-weakref@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.0
+  checksum: fdafb7b955671dd2f9658ff47c86e4025c0650fc68a3542a40e5a75898a763b1abd6b1e1f9f13207eed49541cdd76af67d73c44989ea358b201b70274cf8f6c1
+  languageName: node
+  linkType: hard
+
 "is-windows@npm:^1.0.1, is-windows@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-windows@npm:1.0.2"
@@ -7946,18 +8275,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"load-json-file@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "load-json-file@npm:4.0.0"
-  dependencies:
-    graceful-fs: ^4.1.2
-    parse-json: ^4.0.0
-    pify: ^3.0.0
-    strip-bom: ^3.0.0
-  checksum: 8f5d6d93ba64a9620445ee9bde4d98b1eac32cf6c8c2d20d44abfa41a6945e7969456ab5f1ca2fb06ee32e206c9769a20eec7002fe290de462e8c884b6b8b356
-  languageName: node
-  linkType: hard
-
 "loader-runner@npm:^2.4.0":
   version: 2.4.0
   resolution: "loader-runner@npm:2.4.0"
@@ -8036,7 +8353,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"lodash-es@npm:^4.17.15, lodash-es@npm:^4.17.21":
+"lodash-es@npm:^4.17.21":
   version: 4.17.21
   resolution: "lodash-es@npm:4.17.21"
   checksum: 05cbffad6e2adbb331a4e16fbd826e7faee403a1a04873b82b42c0f22090f280839f85b95393f487c1303c8a3d2a010048bf06151a6cbe03eee4d388fb0a12d2
@@ -8744,6 +9061,15 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"nanoid@npm:^3.1.30":
+  version: 3.1.30
+  resolution: "nanoid@npm:3.1.30"
+  bin:
+    nanoid: bin/nanoid.cjs
+  checksum: 276d0d4b0c41c46aeefec5f09f093e4085a2352d06881c845db22b84f8ef72cc8defae6d76bfb1d8a2a128eb2dec42ab148d16582be4e7754c97905806ef57b6
+  languageName: node
+  linkType: hard
+
 "nanomatch@npm:^1.2.9":
   version: 1.2.9
   resolution: "nanomatch@npm:1.2.9"
@@ -8899,10 +9225,10 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^1.1.75":
-  version: 1.1.75
-  resolution: "node-releases@npm:1.1.75"
-  checksum: 74028e7d193c9c5986b2f6bb51f4f6405a3f144599bbb19751c81faece52af8eb3f5abac40cbcd11ead44be3f856be125aa71fbb8dd8bf0c7f90caa94179ee51
+"node-releases@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "node-releases@npm:2.0.1"
+  checksum: b20dd8d4bced11f75060f0387e05e76b9dc4a0451f7bb3516eade6f50499ea7768ba95d8a60d520c193402df1e58cb3fe301510cc1c1ad68949c3d57b5149866
   languageName: node
   linkType: hard
 
@@ -8929,18 +9255,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^2.3.2":
-  version: 2.5.0
-  resolution: "normalize-package-data@npm:2.5.0"
-  dependencies:
-    hosted-git-info: ^2.1.4
-    resolve: ^1.10.0
-    semver: 2 || 3 || 4 || 5
-    validate-npm-package-license: ^3.0.1
-  checksum: 7999112efc35a6259bc22db460540cae06564aa65d0271e3bdfa86876d08b0e578b7b5b0028ee61b23f1cae9fc0e7847e4edc0948d3068a39a2a82853efc8499
-  languageName: node
-  linkType: hard
-
 "normalize-path@npm:^2.1.1":
   version: 2.1.1
   resolution: "normalize-path@npm:2.1.1"
@@ -9041,6 +9355,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"object-inspect@npm:^1.11.0":
+  version: 1.11.0
+  resolution: "object-inspect@npm:1.11.0"
+  checksum: 8c64f89ce3a7b96b6925879ad5f6af71d498abc217e136660efecd97452991216f375a7eb47cb1cb50643df939bf0c7cc391567b7abc6a924d04679705e58e27
+  languageName: node
+  linkType: hard
+
 "object-keys@npm:^1.0.11, object-keys@npm:^1.0.12, object-keys@npm:^1.0.8, object-keys@npm:^1.1.1":
   version: 1.1.1
   resolution: "object-keys@npm:1.1.1"
@@ -9081,26 +9402,35 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "object.entries@npm:1.1.4"
+"object.entries@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "object.entries@npm:1.1.5"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.1.3
-    es-abstract: ^1.18.2
-  checksum: 1ddd2e28f5ecfe2369fe198439ec0457529f3eec85c7f43870be8de3ec3d98024b014ddb4a769ca48925e47ed76c69a51d8bf2c9886ed43174e3a1d33c2dbe38
+    es-abstract: ^1.19.1
+  checksum: d658696f74fd222060d8428d2a9fda2ce736b700cb06f6bdf4a16a1892d145afb746f453502b2fa55d1dca8ead6f14ddbcf66c545df45adadea757a6c4cd86c7
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "object.fromentries@npm:2.0.4"
+"object.fromentries@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "object.fromentries@npm:2.0.5"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.1.3
-    es-abstract: ^1.18.0-next.2
-    has: ^1.0.3
-  checksum: 1e8e991c43a463a6389c6ee6935ef3843931fb012c5eed2ec30e3d5cf3760cb853f527723cdc98fb770d9c0cd068449448b03c303f527e7926a97d43daaa5c66
+    es-abstract: ^1.19.1
+  checksum: 61a0b565ded97b76df9e30b569729866e1824cce902f98e90bb106e84f378aea20163366f66dc75c9000e2aad2ed0caf65c6f530cb2abc4c0c0f6c982102db4b
+  languageName: node
+  linkType: hard
+
+"object.hasown@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "object.hasown@npm:1.1.0"
+  dependencies:
+    define-properties: ^1.1.3
+    es-abstract: ^1.19.1
+  checksum: 5c5d0b1b793514609f7a635f3110fbd346e142c9afd2485b802775e1ef6c90e48ff6e8e8744927933370ba30964e21af9c5fcf782b47f34d650aa6b277565330
   languageName: node
   linkType: hard
 
@@ -9113,14 +9443,14 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.3, object.values@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "object.values@npm:1.1.4"
+"object.values@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "object.values@npm:1.1.5"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.1.3
-    es-abstract: ^1.18.2
-  checksum: 1a2f1e9d0bcfc299b8491170a50e6e7ca23392641d7781a8528e96c72f0013ba7ee731792ff8586c8eaec0328acda16c59622924c82c58bd0eb5c4ee67794856
+    es-abstract: ^1.19.1
+  checksum: 0f17e99741ebfbd0fa55ce942f6184743d3070c61bd39221afc929c8422c4907618c8da694c6915bc04a83ab3224260c779ba37fc07bb668bdc5f33b66a902a4
   languageName: node
   linkType: hard
 
@@ -9377,16 +9707,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"parse-json@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "parse-json@npm:4.0.0"
-  dependencies:
-    error-ex: ^1.3.1
-    json-parse-better-errors: ^1.0.1
-  checksum: 0fe227d410a61090c247e34fa210552b834613c006c2c64d9a05cfe9e89cf8b4246d1246b1a99524b53b313e9ac024438d0680f67e33eaed7e6f38db64cfe7b5
-  languageName: node
-  linkType: hard
-
 "parse-json@npm:^5.0.0":
   version: 5.0.0
   resolution: "parse-json@npm:5.0.0"
@@ -9499,15 +9819,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"path-type@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "path-type@npm:3.0.0"
-  dependencies:
-    pify: ^3.0.0
-  checksum: 735b35e256bad181f38fa021033b1c33cfbe62ead42bb2222b56c210e42938eecb272ae1949f3b6db4ac39597a61b44edd8384623ec4d79bfdc9a9c0f12537a6
-  languageName: node
-  linkType: hard
-
 "path-type@npm:^4.0.0":
   version: 4.0.0
   resolution: "path-type@npm:4.0.0"
@@ -9528,6 +9839,13 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "picocolors@npm:1.0.0"
+  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1":
   version: 2.2.2
   resolution: "picomatch@npm:2.2.2"
@@ -9549,13 +9867,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"pify@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "pify@npm:3.0.0"
-  checksum: 6cdcbc3567d5c412450c53261a3f10991665d660961e06605decf4544a61a97a54fefe70a68d5c37080ff9d6f4cf51444c90198d1ba9f9309a6c0d6e9f5c4fde
-  languageName: node
-  linkType: hard
-
 "pify@npm:^4.0.1":
   version: 4.0.1
   resolution: "pify@npm:4.0.1"
@@ -9606,15 +9917,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"pkg-up@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "pkg-up@npm:2.0.0"
-  dependencies:
-    find-up: ^2.1.0
-  checksum: de4b418175281a082e366ce1a919f032520ee53cf421578b35173f03816f6ec4c19e1552066840bb0988c3e1215859653948efd6ca3507a23f4f44229269500d
-  languageName: node
-  linkType: hard
-
 "portfinder@npm:^1.0.26":
   version: 1.0.26
   resolution: "portfinder@npm:1.0.26"
@@ -9790,14 +10092,14 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.3.6":
-  version: 8.3.6
-  resolution: "postcss@npm:8.3.6"
+"postcss@npm:^8.3.11":
+  version: 8.3.11
+  resolution: "postcss@npm:8.3.11"
   dependencies:
-    colorette: ^1.2.2
-    nanoid: ^3.1.23
+    nanoid: ^3.1.30
+    picocolors: ^1.0.0
     source-map-js: ^0.6.2
-  checksum: ff55b91bea21f42c2a94d77fd05c3f66dd15889c68506cf1dbb9cdee8c3b9e9d0e219bcbc6e61a107bd63e3cac0670176486e2a5794c106a4e1b9babceb79317
+  checksum: 1a230553d74c66aa9585c90781ed8ea75f19cefea405d2117b67fbeb24b5b5e0e17be2e0c5a07db31dd085643a13394127ab2222e940771b70498331bf20f35e
   languageName: node
   linkType: hard
 
@@ -9899,106 +10201,105 @@ fsevents@^1.2.7:
   version: 0.0.0-use.local
   resolution: "pterodactyl-panel@workspace:."
   dependencies:
-    "@": "link:./resources/scripts"
-    "@babel/core": ^7.14.5
-    "@babel/plugin-proposal-class-properties": ^7.14.5
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.14.5
-    "@babel/plugin-proposal-object-rest-spread": ^7.14.5
-    "@babel/plugin-proposal-optional-chaining": ^7.14.5
+    "@babel/core": ^7.16.0
+    "@babel/plugin-proposal-class-properties": ^7.16.0
+    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.16.0
+    "@babel/plugin-proposal-object-rest-spread": ^7.16.0
+    "@babel/plugin-proposal-optional-chaining": ^7.16.0
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
-    "@babel/plugin-transform-react-jsx": ^7.14.5
-    "@babel/plugin-transform-runtime": ^7.14.5
-    "@babel/preset-env": ^7.14.5
-    "@babel/preset-react": ^7.14.5
-    "@babel/preset-typescript": ^7.14.5
-    "@babel/runtime": ^7.14.5
-    "@codemirror/autocomplete": ^0.19.3
+    "@babel/plugin-transform-react-jsx": ^7.16.0
+    "@babel/plugin-transform-runtime": ^7.16.0
+    "@babel/preset-env": ^7.16.0
+    "@babel/preset-react": ^7.16.0
+    "@babel/preset-typescript": ^7.16.0
+    "@babel/runtime": ^7.16.3
+    "@codemirror/autocomplete": ^0.19.0
     "@codemirror/closebrackets": ^0.19.0
-    "@codemirror/commands": ^0.19.2
+    "@codemirror/commands": ^0.19.0
     "@codemirror/comment": ^0.19.0
     "@codemirror/fold": ^0.19.0
-    "@codemirror/gutter": ^0.19.1
-    "@codemirror/highlight": ^0.19.4
+    "@codemirror/gutter": ^0.19.0
+    "@codemirror/highlight": ^0.19.0
     "@codemirror/history": ^0.19.0
-    "@codemirror/lang-cpp": ^0.19.1
-    "@codemirror/lang-css": ^0.19.1
-    "@codemirror/lang-html": ^0.19.1
-    "@codemirror/lang-java": ^0.19.1
-    "@codemirror/lang-javascript": ^0.19.1
-    "@codemirror/lang-json": ^0.19.1
-    "@codemirror/lang-markdown": ^0.19.1
-    "@codemirror/lang-rust": ^0.19.1
-    "@codemirror/lang-sql": ^0.19.3
-    "@codemirror/lang-xml": ^0.19.1
-    "@codemirror/language": ^0.19.2
+    "@codemirror/lang-cpp": ^0.19.0
+    "@codemirror/lang-css": ^0.19.0
+    "@codemirror/lang-html": ^0.19.0
+    "@codemirror/lang-java": ^0.19.0
+    "@codemirror/lang-javascript": ^0.19.0
+    "@codemirror/lang-json": ^0.19.0
+    "@codemirror/lang-markdown": ^0.19.0
+    "@codemirror/lang-rust": ^0.19.0
+    "@codemirror/lang-sql": ^0.19.0
+    "@codemirror/lang-xml": ^0.19.0
+    "@codemirror/language": ^0.19.0
     "@codemirror/legacy-modes": ^0.19.0
     "@codemirror/lint": ^0.19.0
-    "@codemirror/matchbrackets": ^0.19.1
+    "@codemirror/matchbrackets": ^0.19.0
     "@codemirror/rectangular-selection": ^0.19.0
     "@codemirror/search": ^0.19.0
-    "@codemirror/state": ^0.19.1
-    "@codemirror/stream-parser": ^0.19.1
-    "@codemirror/theme-one-dark": ^0.19.0
-    "@codemirror/view": ^0.19.4
+    "@codemirror/state": ^0.19.0
+    "@codemirror/stream-parser": ^0.19.0
+    "@codemirror/view": ^0.19.0
     "@fortawesome/fontawesome-svg-core": ^1.2.36
     "@fortawesome/free-brands-svg-icons": ^5.15.4
     "@fortawesome/free-regular-svg-icons": ^5.15.4
     "@fortawesome/free-solid-svg-icons": ^5.15.4
-    "@fortawesome/react-fontawesome": ^0.1.15
+    "@fortawesome/react-fontawesome": ^0.1.16
+    "@heroicons/react": ^1.0.5
     "@hot-loader/react-dom": ^16.14.0
-    "@tailwindcss/forms": ^0.3.3
+    "@tailwindcss/forms": ^0.3.4
     "@types/chart.js": ^2.9.34
-    "@types/debounce": ^1.2.0
+    "@types/debounce": ^1.2.1
     "@types/events": ^3.0.0
     "@types/history": ^4.7.9
-    "@types/node": ^16.9.1
+    "@types/node": ^16.11.7
     "@types/qrcode.react": ^1.0.2
     "@types/query-string": ^6.3.0
-    "@types/react": ^16.14.15
-    "@types/react-copy-to-clipboard": ^5.0.1
+    "@types/react": ^16.14.20
+    "@types/react-copy-to-clipboard": ^5.0.2
     "@types/react-dom": ^16.9.14
-    "@types/react-redux": ^7.1.18
-    "@types/react-router": ^5.1.16
-    "@types/react-router-dom": ^5.1.8
-    "@types/react-select": ^4.0.17
-    "@types/react-transition-group": ^4.4.2
-    "@types/styled-components": ^5.1.14
+    "@types/react-redux": ^7.1.20
+    "@types/react-router": ^5.1.17
+    "@types/react-router-dom": ^5.3.2
+    "@types/react-select": ^4.0.18
+    "@types/react-transition-group": ^4.4.4
+    "@types/styled-components": ^5.1.15
     "@types/uuid": ^3.4.10
-    "@types/webappsec-credential-management": ^0.6.1
-    "@types/webpack-env": ^1.16.2
+    "@types/webappsec-credential-management": ^0.6.2
+    "@types/webpack-env": ^1.16.3
     "@types/yup": ^0.29.13
-    "@typescript-eslint/eslint-plugin": ^4.30.0
-    "@typescript-eslint/parser": ^4.30.0
-    autoprefixer: ^10.3.4
+    "@typescript-eslint/eslint-plugin": ^4.33.0
+    "@typescript-eslint/parser": ^4.33.0
+    autoprefixer: ^10.4.0
     axios: ^0.21.4
-    babel-loader: ^8.2.2
+    babel-loader: ^8.2.3
     babel-plugin-macros: ^3.1.0
-    babel-plugin-styled-components: ^1.13.2
-    browserslist: ^4.17.0
+    babel-plugin-styled-components: ^1.13.3
+    browserslist: ^4.17.6
     chart.js: ^2.9.4
     cross-env: ^7.0.3
     css-loader: ^5.2.7
-    date-fns: ^2.23.0
+    date-fns: ^2.25.0
     debounce: ^1.2.1
     deepmerge: ^4.2.2
-    easy-peasy: ^5.0.3
+    easy-peasy: ^5.0.4
     eslint: ^7.32.0
     eslint-config-standard: ^16.0.3
-    eslint-plugin-import: ^2.23.4
+    eslint-plugin-import: ^2.25.3
     eslint-plugin-node: ^11.1.0
-    eslint-plugin-promise: ^5.1.0
-    eslint-plugin-react: ^7.24.0
-    eslint-plugin-react-hooks: ^4.2.0
+    eslint-plugin-promise: ^5.1.1
+    eslint-plugin-react: ^7.27.0
+    eslint-plugin-react-hooks: ^4.3.0
     events: ^3.3.0
     feature: "link:./resources/scripts/components/server/features"
-    fork-ts-checker-webpack-plugin: ^6.3.3
+    fork-ts-checker-webpack-plugin: ^6.4.0
     formik: ^2.2.9
     history: ^4.10.1
     i18next: ^20.6.1
     i18next-chained-backend: ^3.0.2
     i18next-localstorage-backend: ^3.1.3
     i18next-xhr-backend: ^3.2.2
-    postcss: ^8.3.6
+    postcss: ^8.3.11
     qrcode.react: ^1.0.1
     query-string: ^7.0.1
     react: ^16.14.0
@@ -10008,9 +10309,9 @@ fsevents@^1.2.7:
     react-ga: ^3.3.0
     react-google-recaptcha: ^2.1.0
     react-hot-loader: ^4.13.0
-    react-i18next: ^11.11.4
+    react-i18next: ^11.14.2
     react-router: ^5.2.1
-    react-router-dom: ^5.2.1
+    react-router-dom: ^5.3.0
     react-select: ^4.3.1
     react-transition-group: ^4.4.2
     reaptcha: ^1.7.3
@@ -10018,27 +10319,27 @@ fsevents@^1.2.7:
     sockette: ^2.0.6
     source-map-loader: ^1.1.3
     style-loader: ^2.0.0
-    styled-components: ^5.3.1
+    styled-components: ^5.3.3
     styled-components-breakpoint: ^3.0.0-preview.20
     svg-url-loader: ^7.1.1
     swr: ^1.0.1
     tailwindcss: ^2.2.7
     terser-webpack-plugin: ^4.2.3
-    twin.macro: ^2.7.0
-    typescript: ^4.4.3
+    twin.macro: ^2.8.1
+    typescript: ^4.4.4
     uuid: ^3.4.0
     webpack: ^4.46.0
     webpack-assets-manifest: ^4.0.6
     webpack-bundle-analyzer: ^4.4.2
     webpack-cli: ^3.3.12
     webpack-dev-server: ^3.11.2
-    xterm: ^4.14.1
+    xterm: ^4.15.0
     xterm-addon-attach: ^0.6.0
     xterm-addon-fit: ^0.5.0
     xterm-addon-search: ^0.8.1
     xterm-addon-search-bar: ^0.2.0
     xterm-addon-web-links: ^0.4.0
-    yup: ^0.32.9
+    yup: ^0.32.11
   languageName: unknown
   linkType: soft
 
@@ -10371,16 +10672,16 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-i18next@npm:^11.11.4":
-  version: 11.11.4
-  resolution: "react-i18next@npm:11.11.4"
+"react-i18next@npm:^11.14.2":
+  version: 11.14.2
+  resolution: "react-i18next@npm:11.14.2"
   dependencies:
     "@babel/runtime": ^7.14.5
     html-parse-stringify: ^3.0.1
   peerDependencies:
     i18next: ">= 19.0.0"
     react: ">= 16.8.0"
-  checksum: 5630bfe1b39e6ce893fcccfba62cd42db92d130c0d00f181ec3bc68884ee0db3c698d0b6320d05dc783e5e32c14f7e547bb8aa034788a5f317563ad32f29edf9
+  checksum: 336051bda04f381b309a6737044038cd9b7b90077bb080f90860c683286bf88b1d774d40f4c2655ee66c4ab03267990a6ad562169430bf4b2d436b1064963814
   languageName: node
   linkType: hard
 
@@ -10409,7 +10710,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^5.2.1":
+"react-router-dom@npm:^5.3.0":
   version: 5.3.0
   resolution: "react-router-dom@npm:5.3.0"
   dependencies:
@@ -10490,27 +10791,6 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "read-pkg-up@npm:3.0.0"
-  dependencies:
-    find-up: ^2.0.0
-    read-pkg: ^3.0.0
-  checksum: 16175573f2914ab9788897bcbe2a62b5728d0075e62285b3680cebe97059e2911e0134a062cf6e51ebe3e3775312bc788ac2039ed6af38ec68d2c10c6f2b30fb
-  languageName: node
-  linkType: hard
-
-"read-pkg@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "read-pkg@npm:3.0.0"
-  dependencies:
-    load-json-file: ^4.0.0
-    normalize-package-data: ^2.3.2
-    path-type: ^3.0.0
-  checksum: 398903ebae6c7e9965419a1062924436cc0b6f516c42c4679a90290d2f87448ed8f977e7aa2dbba4aa1ac09248628c43e493ac25b2bc76640e946035200e34c6
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:1 || 2, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.4, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.6":
   version: 2.3.6
   resolution: "readable-stream@npm:2.3.6"
@@ -10611,13 +10891,12 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"redux@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "redux@npm:4.0.5"
+"redux@npm:^4.1.1":
+  version: 4.1.2
+  resolution: "redux@npm:4.1.2"
   dependencies:
-    loose-envify: ^1.4.0
-    symbol-observable: ^1.2.0
-  checksum: 23689ba4318bfffd4517c8c8d49c5e9a7df1b864b3cf4a4784e10060652e28054586a4a64053d1252ae5f105da61cda03fe01a422b05a053c8604b1be1689d16
+    "@babel/runtime": ^7.9.2
+  checksum: 6a839cee5bd580c5298d968e9e2302150e961318253819bcd97f9d945a5a409559eacddf6026f4118bb68b681c593d90e8a2c5bbf278f014aff9bf0d2d8fa084
   languageName: node
   linkType: hard
 
@@ -10843,7 +11122,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"resolve@^1.10.0, resolve@^1.10.1":
+resolve@^1.10.1:
   version: 1.12.0
   resolution: "resolve@npm:1.12.0"
   dependencies:
@@ -10852,7 +11131,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"resolve@^1.12.0, resolve@^1.13.1":
+resolve@^1.12.0:
   version: 1.17.0
   resolution: "resolve@npm:1.17.0"
   dependencies:
@@ -10881,7 +11160,7 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>":
   version: 1.12.0
   resolution: "resolve@patch:resolve@npm%3A1.12.0#~builtin<compat/resolve>::version=1.12.0&hash=00b1ff"
   dependencies:
@@ -10890,7 +11169,7 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.13.1#~builtin<compat/resolve>":
+"resolve@patch:resolve@^1.12.0#~builtin<compat/resolve>":
   version: 1.17.0
   resolution: "resolve@patch:resolve@npm%3A1.17.0#~builtin<compat/resolve>::version=1.17.0&hash=00b1ff"
   dependencies:
@@ -11093,15 +11372,6 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.6.0":
-  version: 5.7.1
-  resolution: "semver@npm:5.7.1"
-  bin:
-    semver: ./bin/semver
-  checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
-  languageName: node
-  linkType: hard
-
 "semver@npm:7.0.0":
   version: 7.0.0
   resolution: "semver@npm:7.0.0"
@@ -11111,6 +11381,15 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
+"semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.6.0":
+  version: 5.7.1
+  resolution: "semver@npm:5.7.1"
+  bin:
+    semver: ./bin/semver
+  checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
+  languageName: node
+  linkType: hard
+
 "semver@npm:^6.0.0, semver@npm:^6.1.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
   version: 6.3.0
   resolution: "semver@npm:6.3.0"
@@ -11559,40 +11838,6 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"spdx-correct@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "spdx-correct@npm:3.1.1"
-  dependencies:
-    spdx-expression-parse: ^3.0.0
-    spdx-license-ids: ^3.0.0
-  checksum: 77ce438344a34f9930feffa61be0eddcda5b55fc592906ef75621d4b52c07400a97084d8701557b13f7d2aae0cb64f808431f469e566ef3fe0a3a131dcb775a6
-  languageName: node
-  linkType: hard
-
-"spdx-exceptions@npm:^2.1.0":
-  version: 2.3.0
-  resolution: "spdx-exceptions@npm:2.3.0"
-  checksum: cb69a26fa3b46305637123cd37c85f75610e8c477b6476fa7354eb67c08128d159f1d36715f19be6f9daf4b680337deb8c65acdcae7f2608ba51931540687ac0
-  languageName: node
-  linkType: hard
-
-"spdx-expression-parse@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "spdx-expression-parse@npm:3.0.1"
-  dependencies:
-    spdx-exceptions: ^2.1.0
-    spdx-license-ids: ^3.0.0
-  checksum: a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde
-  languageName: node
-  linkType: hard
-
-"spdx-license-ids@npm:^3.0.0":
-  version: 3.0.5
-  resolution: "spdx-license-ids@npm:3.0.5"
-  checksum: b1ceea3f87407ec375d1de90f6fc7610d6c845ff5f8db21d4d752b3d4e121df563c78113df7c564daff4e8778ad54b9a9024a7e9ea3779f13a43dd0e9128c08e
-  languageName: node
-  linkType: hard
-
 "spdy-transport@npm:^3.0.0":
   version: 3.0.0
   resolution: "spdy-transport@npm:3.0.0"
@@ -11784,19 +12029,19 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "string.prototype.matchall@npm:4.0.5"
+"string.prototype.matchall@npm:^4.0.6":
+  version: 4.0.6
+  resolution: "string.prototype.matchall@npm:4.0.6"
   dependencies:
     call-bind: ^1.0.2
     define-properties: ^1.1.3
-    es-abstract: ^1.18.2
+    es-abstract: ^1.19.1
     get-intrinsic: ^1.1.1
     has-symbols: ^1.0.2
     internal-slot: ^1.0.3
     regexp.prototype.flags: ^1.3.1
     side-channel: ^1.0.4
-  checksum: 0a9d64661ecf089e7712aed18a4b0d7e4093ae1dfc6d8134747a98271564065a2a667a3408fced4a77137528b3b2c0efe9d37868acae000ee13d0857a3d0f430
+  checksum: 07aca53ddd8a096a8bd0560eb8574386c6b3887a6a06b40a98abd42c94dadeed3296261fca22fec59a1ed970d199bdeb450fcb6a7390193588d9c6b5f48fe842
   languageName: node
   linkType: hard
 
@@ -11938,9 +12183,9 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"styled-components@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "styled-components@npm:5.3.1"
+"styled-components@npm:^5.3.3":
+  version: 5.3.3
+  resolution: "styled-components@npm:5.3.3"
   dependencies:
     "@babel/helper-module-imports": ^7.0.0
     "@babel/traverse": ^7.4.5
@@ -11956,7 +12201,7 @@ resolve@^2.0.0-next.3:
     react: ">= 16.8.0"
     react-dom: ">= 16.8.0"
     react-is: ">= 16.8.0"
-  checksum: 2d833d573c039f4af5c422ce33f06212dfa51a821994ec1d7a697355752b422cad6e92eeff712dbd9c0339aade8eb5bce10c30dfecb3c8e707530b6dda7dda10
+  checksum: a104341068fc39fa2c73950a34970d832dc7a511fc52b3df12f34e6746031f1f128f53b4d540bf39d9f0da043cf0d91517faf874d2c87de5e385f5c2e7620436
   languageName: node
   linkType: hard
 
@@ -12349,22 +12594,22 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"ts-toolbelt@npm:^9.3.12":
+"ts-toolbelt@npm:^9.6.0":
   version: 9.6.0
   resolution: "ts-toolbelt@npm:9.6.0"
   checksum: 9f35fd95d895a5d32ea9fd2e532a695b0bae6cbff6832b77292efa188a0ed1ed6e54f63f74a8920390f3d909a7a3adb20a144686372a8e78b420246a9bd3d58a
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.9.0":
-  version: 3.9.0
-  resolution: "tsconfig-paths@npm:3.9.0"
+"tsconfig-paths@npm:^3.11.0":
+  version: 3.11.0
+  resolution: "tsconfig-paths@npm:3.11.0"
   dependencies:
     "@types/json5": ^0.0.29
     json5: ^1.0.1
     minimist: ^1.2.0
     strip-bom: ^3.0.0
-  checksum: 243b3b098c76a4ca90ea0431683f3755a4ff175c6123bcba5f7b4bd80fe2ef8fa9bdc8f4d525148a1e71ade7f3e037e7c0313ae177fd12398ab68f05c2c7f25d
+  checksum: e14aaa6883f316d611db41cbb0fc8779b59c66b31d1e045565ad4540c77ccd3d2bb66f7c261b74ff535d3cc6b4a1ce21dc84774bf2a2a603ed6b0fb96f7e0cc7
   languageName: node
   linkType: hard
 
@@ -12400,9 +12645,9 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"twin.macro@npm:^2.7.0":
-  version: 2.7.0
-  resolution: "twin.macro@npm:2.7.0"
+"twin.macro@npm:^2.8.1":
+  version: 2.8.1
+  resolution: "twin.macro@npm:2.8.1"
   dependencies:
     "@babel/parser": ^7.12.5
     "@babel/template": ^7.14.5
@@ -12419,7 +12664,7 @@ resolve@^2.0.0-next.3:
     string-similarity: ^4.0.3
     tailwindcss: ^2.2.7
     timsort: ^0.3.0
-  checksum: 241c1f24dd081e6a06ba5982925b658045d27c0e7df25a32633cbb85e6cfc8a8f05101955aac2e8a529643cbb845c48d3fbb3c174284798cf96fefaba299f1bb
+  checksum: ed93ff973f95012fa47beaadea1c71eaabdf9c5982f4064625dcc7d9516cc183493797a9a520ca0d95e1a1e5e00b55ac2320b731dfc7ded1b402ceaedb0a1096
   languageName: node
   linkType: hard
 
@@ -12456,23 +12701,23 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-typescript@^4.4.3:
-  version: 4.4.3
-  resolution: "typescript@npm:4.4.3"
+typescript@^4.4.4:
+  version: 4.4.4
+  resolution: "typescript@npm:4.4.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 05823f21796d450531a7e4ab299715d38fd9ded0e4ce7400876053f4b5166ca3dde7a68cecfe72d9086039f03c0b6edba36516fb10ed83c5837d9600532ea4c2
+  checksum: 89ecb8436bb48ef5594d49289f5f89103071716b6e4844278f4fb3362856e31203e187a9c76d205c3f0b674d221a058fd28310dbcbcf5d95e9a57229bb5203f1
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@^4.4.3#~builtin<compat/typescript>":
-  version: 4.4.3
-  resolution: "typescript@patch:typescript@npm%3A4.4.3#~builtin<compat/typescript>::version=4.4.3&hash=32657b"
+"typescript@patch:typescript@^4.4.4#~builtin<compat/typescript>":
+  version: 4.4.4
+  resolution: "typescript@patch:typescript@npm%3A4.4.4#~builtin<compat/typescript>::version=4.4.4&hash=32657b"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 28ab98313afab46788ff41014fdb5932430ada6e03cf9e92ac47f406526a2cac1ae2894834e7da61e46b7429318e9c47f45ba8de323332f0cb9af99b72ebae74
+  checksum: c97c33903f1eb4f9e178649befdfc859d93157db1eccd1e521e84976ec6861db53412d8018e5e4c5d09268771c65498d42caa64bd881878346c3644f6b7cd202
   languageName: node
   linkType: hard
 
@@ -12713,16 +12958,6 @@ typescript@^4.4.3:
   languageName: node
   linkType: hard
 
-"validate-npm-package-license@npm:^3.0.1":
-  version: 3.0.4
-  resolution: "validate-npm-package-license@npm:3.0.4"
-  dependencies:
-    spdx-correct: ^3.0.0
-    spdx-expression-parse: ^3.0.0
-  checksum: 35703ac889d419cf2aceef63daeadbe4e77227c39ab6287eeb6c1b36a746b364f50ba22e88591f5d017bc54685d8137bc2d328d0a896e4d3fd22093c0f32a9ad
-  languageName: node
-  linkType: hard
-
 "value-equal@npm:^0.4.0":
   version: 0.4.0
   resolution: "value-equal@npm:0.4.0"
@@ -13189,10 +13424,10 @@ typescript@^4.4.3:
   languageName: node
   linkType: hard
 
-"xterm@npm:^4.14.1":
-  version: 4.14.1
-  resolution: "xterm@npm:4.14.1"
-  checksum: 49e26b1de3f6772ea980adb1f630b3e065eea921b91d9126acce1b09050575c7773358ece6cdf5bd2ae9f5daab85ab45ce8b1c5caada850cd5b293b9132a97a5
+"xterm@npm:^4.15.0":
+  version: 4.15.0
+  resolution: "xterm@npm:4.15.0"
+  checksum: dae5fd8c7ea5ae8797d6810cb493d45957a30b46c17b6e8f93506ab5f83d09c877e152e2fc0bec6a3c39ff27902bf8f9b8f2966a042e5484d6166f3123fc1dfc
   languageName: node
   linkType: hard
 
@@ -13266,17 +13501,17 @@ typescript@^4.4.3:
   languageName: node
   linkType: hard
 
-"yup@npm:^0.32.9":
-  version: 0.32.9
-  resolution: "yup@npm:0.32.9"
+"yup@npm:^0.32.11":
+  version: 0.32.11
+  resolution: "yup@npm:0.32.11"
   dependencies:
-    "@babel/runtime": ^7.10.5
-    "@types/lodash": ^4.14.165
-    lodash: ^4.17.20
-    lodash-es: ^4.17.15
+    "@babel/runtime": ^7.15.4
+    "@types/lodash": ^4.14.175
+    lodash: ^4.17.21
+    lodash-es: ^4.17.21
     nanoclone: ^0.2.1
     property-expr: ^2.0.4
     toposort: ^2.0.2
-  checksum: 3f33850913a237fb7e59b0b5c71d2cc6bdb1d6b2b01fc24c53ec68b35ad2b95cd49f735532117136495cb57f0ec58f0a7e1f1c55fad685555c7114155170f1ea
+  checksum: 43a16786b47cc910fed4891cebdd89df6d6e31702e9462e8f969c73eac88551ce750732608012201ea6b93802c8847cb0aa27b5d57370640f4ecf30f9f97d4b0
   languageName: node
   linkType: hard