diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 5ef1390c..e17866da 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -6,9 +6,11 @@ body:
   - type: markdown
     attributes:
       value: |
-          If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel.
-          * `A fatal error was encountered while starting this server.`
-          * `No server egg configuration could be located; aborting startup.`
+        If you see any of the following, go to [Discord](https://discord.gg/pterodactyl) and report your error in a support channel.
+        * `A fatal error was encountered while starting this server.`
+        * `No server egg configuration could be located; aborting startup.`
+
+        Make sure there are no existing bug reports by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aopen+is%3Aissue+label%3ABug).
   - type: input
     id: panel-version
     attributes:
@@ -24,7 +26,7 @@ body:
       description: Version number of your Wings (latest is not a version)
       placeholder: 1.x.x
     validations:
-      required: true      
+      required: true
   - type: input
     id: service
     attributes:
@@ -32,18 +34,18 @@ body:
       description: Service you are experiencing issues with
       placeholder: minecraft/factorio/etc
     validations:
-      required: true          
+      required: true
   - type: dropdown
     id: modified
     attributes:
       label: Modified
       description: Did you add or change things, this includes startup configs/install scripts/variables
       options:
-        -  Yes, I modified the egg (will provide details below)
-        -  No, I did not modify the egg   
+        - Yes, I modified the egg (will provide details below)
+        - No, I did not modify the egg
     validations:
-      required: true 
-  - type: textarea          
+      required: true
+  - type: textarea
     id: expected-behavior
     attributes:
       label: Expected Behavior
@@ -51,7 +53,7 @@ body:
       placeholder: Install the server, start it, play
     validations:
       required: true
-  - type: textarea      
+  - type: textarea
     id: actual-behavior
     attributes:
       label: Actual Behavior
@@ -59,20 +61,26 @@ body:
       placeholder: Server crashed with error X
     validations:
       required: true
-  - type: textarea       
+  - type: textarea
     id: reproduce-steps
     attributes:
       label: Steps To Reproduce
       description: Step by step what to do to cause the issue
       placeholder: |
-       Step 1 Set version to latest
-       Step 2 install
-       Step 3 Receive error X or Y
+        Step 1 Set version to latest
+        Step 2 install
+        Step 3 Receive error X or Y
     validations:
       required: true
-  - type: textarea
-    id: logs
+  - type: input
+    id: install-logs
     attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
\ No newline at end of file
+      label: Install logs
+      description: |
+        Run the command below on the SSH terminal of your Wings machine and provide the link to logs.
+        
+        `tail -n 100 $(ls -Alrt /var/log/pterodactyl/install/*.log | tail -1 | sed 's/  */ /g' | cut -s -d' ' -f9) | nc pteropaste.com 99`
+      placeholder: |
+        https://pteropaste.com/exampleLogs
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/egg-request.yml b/.github/ISSUE_TEMPLATE/egg-request.yml
index 4a144ed2..731f4cfd 100644
--- a/.github/ISSUE_TEMPLATE/egg-request.yml
+++ b/.github/ISSUE_TEMPLATE/egg-request.yml
@@ -1,19 +1,12 @@
-name: 🎮 Game Request
+name: 🥚 Egg Request
 description: Suggest a server to build an egg for
 title: "[Egg Request]: "
+labels: [Egg Request]
 body:
   - type: markdown
     attributes:
       value: |
-          Make sure there are no existing egg requests by searching the repository issues. Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server)
-  - type: input
-    id: service
-    attributes:
-      label: Service
-      description: Service you are experiencing issues with
-      placeholder: minecraft/factorio/etc
-    validations:
-      required: true
+          Make sure there are no existing egg requests by searching the [repository issues](https://github.com/parkervcp/eggs/issues?q=is%3Aissue+is%3Aopen+label%3A%22Egg+Request%22). Please understand how Pterodactyl works when you are requesting an egg. (ie. docker-compose doesn't work for a pterodactyl server)
   - type: dropdown
     id: expand
     attributes:
@@ -26,14 +19,14 @@ body:
   - type: input
     id: game-link
     attributes:
-      label: Link to game
+      label: Link to a game or software
       placeholder: minecraft.net/factorio.com/etc
     validations:
       required: true
   - type: input
     id: download-link
     attributes:
-      label: Links for server downloads
+      label: Links for the download
       description: This needs to be an official link and not one that is hosted on some forum page or a personal Github page.
     validations:
       required: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc795afc..67d02ffe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,45 +2,51 @@
 
 ## General rules
 
-1. Keep it simple.  
-    We don't need 8 miles of install script.  
 
-2. Keep it Small.  
-    Only use what is absolutely needed.  
+1. Keep it simple.
+    We don't need 8 miles of install script.
 
-3. Try to stay in the stock containers.  
+2. Keep it Small.
+    Only use what is absolutely needed.
+
+3. Try to stay in the stock containers.
     If you need something in a container, open a PR in [my yolks repo](https://github.com/parkervcp/yolks) where I can review and pull it up to the main repo. In addition, there is a larger quantity of [images here](https://github.com/parkervcp/images) for you to use that have not been migrated to Yolks yet.
 
-4. Don't be afraid to submit PR's to the egg repo.  
+4. Don't be afraid to submit PR's to the egg repo.
     I don't bite. I will work with you on the egg and the required things to run it.
 
-## Step 1.
-#### Be aware of the pterodactyl install process.
+## Step 1
+
+### Be aware of the pterodactyl install process
 
 The Pterodactyl install process is fairly simple once you know.
-    
+
+```md
     1. Spin up install container
         This uses a volume mount on /mnt/server for the server files.
         This can pull or set up all that is needed to run the server.
         It is regularly used to just download the files required. Such as server files and configs.
-        
+
+
     2. Stop install container
-    
+
     3. Start a new container with the server files in /home/container
         This is where the server is actually run.
         Any dependencies installed during the install process are gone.
         The container that is started should have everything you need.
+```
 
-## Step 2.
-#### Testing
+## Step 2
+
+### Testing
 
 Make sure your install process is rock solid as I will be testing eggs before they ever hit my repo.
 
-I will make suggestions and changes at will.  
+I will make suggestions and changes at will.
 This is to maintain a clean repo that others can pull and be fully aware of what is being done.
 
+## Step 3
 
-## Step 3.
-#### Make a branch and do your work in there.
+### Make a branch and do your work in there
 
 I have been getting messy PR's due to people always PRing from their master branch. Please make a seperate branch and PR from there.
diff --git a/README.md b/README.md
index ac6f4a97..4106dac2 100644
--- a/README.md
+++ b/README.md
@@ -18,20 +18,22 @@ If you are reading this it looks like you are looking to add an egg to your serv
 5. Select what nest you want to put the egg in.
    1. If you want a new nest you need to create it before importing the egg.
 
-# You must restart your daemon after importing an egg if you are using 0.7. This is not required on 1.X.
-
+## You must restart your daemon after importing an egg if you are using 0.7. This is not required on 1.X
 
 ## Please read the CONTRIBUTING.md before submitting PRs
 
 ## [Bots](/bots)
 
 [Discord](/bots/discord)
+
 * [ATL Bot](/bots/discord/atlbot) Node JS
 * [Bastion](/bots/discord/bastion) Node JS
 * [CorpBot](/bots/discord/corpbot) Python
+* [discordgo](bots/discord/discordgo) Golang generic
+* [discord.java](bots/discord/discord.java) Java generic
 * [discord.js](bots/discord/discord.js) Node JS generic
 * [discord.py](bots/discord/discord.py) Python generic
-* [discordgo](bots/discord/discordgo) Golang generic
+* [Dynamica](/bots/discord/dynamica) Node JS
 * [fragbot](/bots/discord/fragbot) Golang
 * [JMusicBot](/bots/discord/jmusicbot) Java
 * [nodemon.js](bots/discord/nodemon.js) Nodemon JS generic
@@ -41,43 +43,57 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [SinusBot](/bots/discord/sinusbot)
 
 [Other](/bots/other)
+
 * [Big Brother Bot](/bots/other/bigbrotherbot)
 
 [Twitch](/bots/twitch)
-  * [PhantomBot](/bots/twitch/phantombot)
-  * [SogeBot](/bots/twitch/sogebot)
+
+* [PhantomBot](/bots/twitch/phantombot)
+* [SogeBot](/bots/twitch/sogebot)
 
 [TeamSpeak3](bots/teamspeak3)
-  * [JTS3ServerMod](/bots/teamspeak3/jts3servermod)
+
+* [JTS3ServerMod](/bots/teamspeak3/jts3servermod)
 
 ## [Database](/database)
+
 ### In-Memory Databases
+
 [Redis](/database/redis)
+
 * [Redis 5](/database/redis/redis-5)
 * [Redis 6](/database/redis/redis-6)
 
 ### noSQL
+
 * [mongoDB](/database/nosql/mongodb)
 
 ### SQL Databases
+
 * [MariaDB](/database/sql/mariadb)
 * [PostgreSQL](/database/sql/postgres)
 
 ## [Voice Servers](/voice_servers)
+
 * [Lavalink](/voice_servers/lavalink)
 * [TeaSpeak](/voice_servers/teaspeak)
 * [TS3-Manager](/voice_servers/ts3_manager)
 
 ## [Game Eggs](/game_eggs)
+
 [Among Us](game_eggs/among_us)
+
 * [Impostor Server](game_eggs/among_us/impostor_server)
 * [CrewLink Server](game_eggs/among_us/crewlink_server)
 
 [BeamNG.drive](game_eggs/beamng)
+
 * [BeamMP Server](game_eggs/beamng/beammp)
 * [KissMP](game_eggs/beamng/kissmp)
 
-[Cryofall](game_eggs/cryofall/cryofall)
+[ClassiCube](game_eggs/classicube)
+
+* [MCGalaxy](game_eggs/classicube/mcgalaxy)
 
 [Call of Duty 4X](game_eggs/cod/cod4x)
 
@@ -86,47 +102,55 @@ If you are reading this it looks like you are looking to add an egg to your serv
 [FTL: Tachyon](game_eggs/ftl/tachyon)
 
 [Factorio](game_eggs/factorio)
+
 * [Vanilla](game_eggs/factorio/factorio)
 * [ModUpdate](game_eggs/factorio/factorio-modupdate)
 
 [Grand Theft Auto](game_eggs/gta)
+
 * GTA V
   * [FiveM](game_eggs/gta/fivem)
   * [RageMP](game_eggs/gta/ragemp)
   * [alt:V](game_eggs/gta/altv)
-  
+
 * GTA SA
   * [Multi Theft Auto](game_eggs/gta/mtasa)
   * [SA-MP](game_eggs/gta/samp)
-  
+
 * GTA
   * [GTAC](game_eggs/gta/gtac)
 
 [Mindustry](game_eggs/mindustry)
-  * [Mindustry](game_eggs/mindustry/mindustry)
+
+* [Mindustry](game_eggs/mindustry/mindustry)
 
 [League Sandbox](game_eggs/leaguesandbox)
-  * [League Sandbox](game_eggs/leaguesandbox/leaguesandbox)
+
+* [League Sandbox](game_eggs/leaguesandbox/leaguesandbox)
 
 [Minetest](game_eggs/minetest) (including MTG)
-  * [Minetest](game_eggs/minetest/minetest)
+
+* [Minetest](game_eggs/minetest/minetest)
 
 [Minecraft](game_eggs/minecraft)
+
 * [Bedrock](game_eggs/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console)
   * [Bedrock](game_eggs/minecraft/bedrock/bedrock)
   * [gomint](game_eggs/minecraft/bedrock/gomint)
-  * [Nukkit](game_eggs/minecraft/bedrock/nukkit)  
-  * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp)  
+  * [Nukkit](game_eggs/minecraft/bedrock/nukkit)
+  * [PocketMine MP](game_eggs/minecraft/bedrock/pocketmine_mp)
 
 * [Java](game_eggs/minecraft/java) Servers for Java Minecraft
   * [Airplane](game_eggs/minecraft/java/airplane)
   * [Cuberite](game_eggs/minecraft/java/cuberite)
-  * [Fabric](game_eggs/minecraft/java/fabric) 
+  * [Fabric](game_eggs/minecraft/java/fabric)
   * [Feather](game_eggs/minecraft/java/feather)  
   * [Feed The Beast](game_eggs/minecraft/java/ftb)  
   * [Forge](game_eggs/minecraft/java/forge)  
+  * [Glowstone](game_eggs/minecraft/java/glowstone)
   * [Magma](game_eggs/minecraft/java/magma)
   * [Mohist](game_eggs/minecraft/java/mohist)
+  * [NanoLimbo](/game_eggs/minecraft/java/nanolimbo)
   * [Paper](game_eggs/minecraft/java/paper)
   * [Purpur](game_eggs/minecraft/java/purpur)
   * [Spigot](game_eggs/minecraft/java/spigot)
@@ -138,27 +162,33 @@ If you are reading this it looks like you are looking to add an egg to your serv
 
 * [Proxies](game_eggs/minecraft/proxy) Minecraft Server Proxies
   * [Java](game_eggs/minecraft/proxy/java)
-	* [FlameCord](game_eggs/minecraft/proxy/java/flamecord)
+    * [FlameCord](game_eggs/minecraft/proxy/java/flamecord)
     * [Travertine](game_eggs/minecraft/proxy/java/travertine)
     * [TyphoonLimbo](game_eggs/minecraft/proxy/java/typhoonlimbo)
     * [Velocity](game_eggs/minecraft/proxy/java/velocity)
     * [Waterfall](game_eggs/minecraft/proxy/java/waterfall)
+  * [Bedrock](game_eggs/minecraft/proxy/bedrock)
+    * [Waterdog PE](game_eggs/minecraft/proxy/bedrock/waterdog_pe)
   * [Cross Platform](game_eggs/minecraft/proxy/cross_platform)
     * [GeyserMC](game_eggs/minecraft/proxy/cross_platform/geyser)
     * [Waterdog](game_eggs/minecraft/proxy/cross_platform/waterdog)
 
-[OpenArena](game_eggs/openarena)  
-  * [openarena](game_eggs/openarena/openarena) 
+[OpenArena](game_eggs/openarena)
+
+* [openarena](game_eggs/openarena/openarena)
 
 [OpenRA](game_eggs/openra)
+
 * [OpenRA Dune2000](game_eggs/openra/openra_dune2000)
 * [OpenRA Red Alert](game_eggs/openra/openra_red_alert)
 * [OpenRA Tiberian Dawn](game_eggs/openra/openra_tiberian_dawn)
 
 [Red Dead Redemption](game_eggs/rdr)
+
 * [RedM](game_eggs/rdr/redm)
 
 [SteamCMD Servers](game_eggs/steamcmd_servers) These eggs use SteamCMD to install
+
 * [7 Days to Die](game_eggs/steamcmd_servers/7_days_to_die)
 * [ARK: Survival Evolved](game_eggs/steamcmd_servers/ark_survival_evolved)
 * [Arma](game_eggs/steamcmd_servers/arma)
@@ -168,6 +198,8 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Barotrauma](game_eggs/steamcmd_servers/barotrauma)
 * [Citadel: Forged with Fire](game_eggs/steamcmd_servers/citadel)
 * [Conan Exiles](game_eggs/steamcmd_servers/conan_exiles)
+* [Craftopia](game_eggs/steamcmd_servers/craftopia)
+* [Cryofall](game_eggs/steamcmd_servers/cryofall)
 * [Don't Starve Together](game_eggs/steamcmd_servers/dont_starve)
 * [ECO](game_eggs/steamcmd_servers/eco)
 * [Fistful of Frags](game_eggs/steamcmd_servers/fof)
@@ -176,6 +208,8 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Hurtworld](game_eggs/steamcmd_servers/hurtworld)
 * [Insurgency: Sandstorm](game_eggs/steamcmd_servers/insurgency_sandstorm)
 * [Killing Floor 2](game_eggs/steamcmd_servers/killing_floor_2)
+* [Left 4 Dead](game_eggs/steamcdm_servers/left4dead)
+* [Left 4 Dead 2](game_eggs/steamcdm_servers/left4dead_2)
 * [Modiverse](game_eggs/steamcmd_servers/modiverse)
 * [Mordhau](game_eggs/steamcmd_servers/mordhau)
 * [No More Room in Hell](game_eggs/steamcmd_servers/nmrih)
@@ -190,6 +224,7 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Rust](game_eggs/steamcmd_servers/rust)
   * [Autowipe](game_eggs/steamcmd_servers/rust/rust_autowipe)
   * [Staging](game_eggs/steamcmd_servers/rust/rust_staging)
+* [Satisfactory](game_eggs/steamcmd_servers/satisfactory)
 * [SCP: Secret Laboratory](game_eggs/steamcmd_servers/scpsl)
   * [dedicated](game_eggs/steamcmd_servers/scpsl/dedicated)
   * [multiadmin](game_eggs/steamcmd_servers/scpsl/multiadmin)
@@ -203,27 +238,27 @@ If you are reading this it looks like you are looking to add an egg to your serv
 * [Sven Co-op](game_eggs/steamcmd_servers/svencoop)
 * [The Forest](game_eggs/steamcmd_servers/the_forest)
 * [Team Fortress 2 Classic](game_eggs/steamcmd_servers/team_fortress_2_classic)
+* [Tower Unite](game_eggs/steamcmd_servers/tower_unite)
 * [Unturned](game_eggs/steamcmd_servers/unturned)
 * [Valheim](game_eggs/steamcmd_servers/valheim)
   * [Valheim Vanilla](game_eggs/steamcmd_servers/valheim/valheim_vanilla)
   * [Valheim Plus Mod](game_eggs/steamcmd_servers/valheim/valheim_plus)
 
 [Teeworlds](game_eggs/teeworlds)
+
 * [Teeworlds](game_eggs/teeworlds/teeworlds)
 
 [Terraria](game_eggs/terraria)
+
 * [Vanilla](game_eggs/terraria/vanilla)
 * [tModLoader](game_eggs/terraria/tmodloader)
 * [TShock](game_eggs/terraria/tshock)
 
 [Tycoon Games](game_eggs/tycoon_games)
+* [OpenRCT2](game_eggs/tycoon_games/openrct2)
 * [OpenTTD](game_eggs/tycoon_games/openttd)
 
-[Unreal Engine](game_eggs/unreal_engine)
-* [Tower Unite](game_eggs/unreal_engine/tower_unite)
-* [Tower Unite](game_eggs/steamcmd_servers/tower_unite)
-
-[Veloren](game_eggs/veloren/veloren)
+[Veloren](game_eggs/veloren)
 
 [Vintage Story](game_eggs/vintage_story/vintage_story)
 
@@ -232,23 +267,41 @@ If you are reading this it looks like you are looking to add an egg to your serv
 [Xonotic](game_eggs/xonotic/xonotic)
 
 ## [Monitoring](/monitoring/)
+
 ### Prometheus
+
 * [Prometheus](/monitoring/prometheus)
 
 ## [Storage](/storage/)
+
 ### S3 Storage
+
 * [minio](/storage/minio)
 
 ## [Software](/software/)
+
 ### Code Server
+
 * [Code-Server](/software/code-server)
+
+### Elasticsearch
+
+* [Elasticsearch](/software/elasticsearch)
+
 ### Gitea
+
 * [Gitea](/software/gitea)
+
 ### Grafana
+
 * [Grafana](/software/grafana)
+
 ### haste-server
+
 * [haste-server](/software/haste-server)
 ### LanguageTool
 * [languagetool](/software/languagetool)
+
 ### RabbitMQ
+
 * [rabbitmq](/software/rabbitmq)
diff --git a/bots/discord/README.md b/bots/discord/README.md
index 99f02d57..6d7490ad 100644
--- a/bots/discord/README.md
+++ b/bots/discord/README.md
@@ -1,56 +1,69 @@
 # Discord Bots
 
-### Some of these bots support other services but are primarily Discord bots
+## Some of these bots support other services but are primarily Discord bots
 
-#### ATLauncher Discord Bot
-[ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot)  
-Their github has all the info you need  
+### [ATLauncher Discord Bot](atlbot)
 
-#### Bastion
-[TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion)  
+[ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot)
+Their github has all the info you need
+
+### [Bastion](bastion)
+
+[TheBastionBot/Bastion](https://github.com/TheBastionBot/Bastion)
 Give awesome perks to your Discord server!
 
-### Corpbot
+### [Corpbot](corpbot)
+
 [corpnewt/CorpBot.py](https://github.com/corpnewt/CorpBot.py)
 A very clumsy python bot for discord
 
-#### DiscordJS
-[discord.js](https://discord.js.org/)  
+### [DiscordJS](discord.js)
+
+[discord.js](https://discord.js.org/)
 A generic discord.js egg for running discord bots.
 
-#### DiscordPY
-[discord.py](https://discordpy.readthedocs.io/en/latest/)  
+### [DiscordPY](discord.py)
+
+[discord.py](https://discordpy.readthedocs.io/en/latest/)
 A generic discord.py egg for running discord bots.
 
-#### discordgo
+### [discordgo](discordgo)
+
 [discordgo](https://github.com/bwmarrin/discordgo)
 A generic go application egg.
 
-#### FragBot
-[fragforce/fragbot](https://github.com/fragforce/fragbot)  
-The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now  
+### [FragBot](fragbot)
 
-#### MusicBot
-[jagrosh/MusicBot](https://github.com/jagrosh/MusicBot)  
-A Discord music bot that's easy to set up and run yourself!  
+[fragforce/fragbot](https://github.com/fragforce/fragbot)
+The bot that runs as the fragforce `@Fragbot` offering looking-for-group services for now
 
-#### nodemon
-[nodemon](https://nodemon.io/)  
+### [JMusicBot](jmusicbot)
+
+[jagrosh/MusicBot](https://github.com/jagrosh/MusicBot)
+A Discord music bot that's easy to set up and run yourself!
+
+### [nodemon](nodemon.js)
+
+[nodemon](https://nodemon.io/)
 A nodemon javascript egg for running and automatically restarting the node application when file changes in the directory are detected
 
-#### parkertron
-[parkervcp/parkertron](https://github.com/parkervcp/parkertron)  
-The bot that runs as the pterodactyl `@Support Bot`  
+### [parkertron](parkertron)
 
-#### PixelBot
-[possatti/pixelbot](https://github.com/possatti/pixelbot)  
-No longer actively developed.  
-Was used to test python services.  
+[parkervcp/parkertron](https://github.com/parkervcp/parkertron)
+The bot that runs as the pterodactyl `@Support Bot`
+
+### [PixelBot](pixelbot)
+
+[possatti/pixelbot](https://github.com/possatti/pixelbot)
+No longer actively developed.
+Was used to test python services.
+
+### [RedBot](redbot)
 
-### RedBot
 [Cog-Creators/Red-DiscordBot](https://github.com/Cog-Creators/Red-DiscordBot)
 A multifunction Discord bot
 
-#### SinusBot
-[SinusBot](https://www.sinusbot.com/)  
+### [SinusBot](sinusbot)
+
+[SinusBot](https://www.sinusbot.com/)
 Please Check their site for an in depth on the bot.
diff --git a/bots/discord/atlbot/README.md b/bots/discord/atlbot/README.md
index 008d3906..f20d135c 100644
--- a/bots/discord/atlbot/README.md
+++ b/bots/discord/atlbot/README.md
@@ -1,6 +1,9 @@
 # ATLBot
-### Their [Github](https://github.com/ATLauncher/discord-bot)
+
+## Their [Github](https://github.com/ATLauncher/discord-bot)
+
 This is the code for our Discord bot which runs on the official ATLauncher Discord server
 
-### Server Ports
-There are no ports required for the atl bot
\ No newline at end of file
+## Server Ports
+
+There are no ports required for the atl bot
diff --git a/bots/discord/bastion/README.md b/bots/discord/bastion/README.md
index 1dc840db..06e0baf1 100644
--- a/bots/discord/bastion/README.md
+++ b/bots/discord/bastion/README.md
@@ -1,13 +1,18 @@
 # Bastion
-### From their [Github](https://github.com/TheBastionBot/Bastion)
-Give awesome perks to your Discord server!  
 
-### Install notes
-Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.  
+## From their [Github](https://github.com/TheBastionBot/Bastion)
+
+Give awesome perks to your Discord server!
+
+## Install notes
+
+Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.
 
 ## Running the bot
+
 You need to enable both `Privileged Gateway Intents` for the bot to run.
 Enable this from `https://discord.com/developers/applications/<applicationid>/bot`
 
-### Server Ports
-No Ports are required for the bastion bot.  
\ No newline at end of file
+## Server Ports
+
+No Ports are required for the bastion bot.
diff --git a/bots/discord/corpbot/README.md b/bots/discord/corpbot/README.md
index 8fd994f9..20d8c2b2 100644
--- a/bots/discord/corpbot/README.md
+++ b/bots/discord/corpbot/README.md
@@ -1,8 +1,11 @@
 # CorpBot.py
-### From their [Github](https://github.com/corpnewt/CorpBot.py)
-A very clumsy python bot for discord 
 
-### Server Ports
+## From their [Github](https://github.com/corpnewt/CorpBot.py)
+
+A very clumsy python bot for discord
+
+## Server Ports
+
 No ports are required to run CorpBot. You can assign a random port to the bot.
 
-#### Mods/Plugins may require ports to be added to the server.
+### Mods/Plugins may require ports to be added to the server
diff --git a/bots/discord/deno/README.md b/bots/discord/deno/README.md
index bf981cfc..4e47367d 100644
--- a/bots/discord/deno/README.md
+++ b/bots/discord/deno/README.md
@@ -1,6 +1,6 @@
 # Deno generic
 
-### From their [site](https://deno.land/)
+## From their [site](https://deno.land/)
 
 This egg is designed to run any generic Deno application, allowing users to pull their own Deno discord bot from a Github repository.
 
@@ -9,14 +9,16 @@ There is an option to allow a user to upload their own files to run a server.
 The startup configs and commands may need changing to actually function properly.
 
 ## Configuration
+
 The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running.
 ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png)
 
 You can use arrays to have multiple different values when different bots are being used
-```
+
+```json
 {
   "done":[
     "change this text 1",
     "change this text 2"
   ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/deno/egg-deno-generic.json b/bots/discord/deno/egg-deno-generic.json
index f42053d8..be652454 100644
--- a/bots/discord/deno/egg-deno-generic.json
+++ b/bots/discord/deno/egg-deno-generic.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-03-30T00:48:40+00:00",
+    "exported_at": "2022-01-22T05:40:17-05:00",
     "name": "Deno Generic",
     "author": "parker@parkervcp.com",
     "description": "A generic egg to run deno code.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/deno run {{JS_FILE}}",
@@ -62,7 +62,7 @@
             "default_value": "0",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         },
         {
             "name": "Git Branch",
@@ -83,4 +83,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/discord java/README.md b/bots/discord/discord.java/README.md
similarity index 98%
rename from bots/discord/discord java/README.md
rename to bots/discord/discord.java/README.md
index 1f18f7d4..57d230ed 100644
--- a/bots/discord/discord java/README.md	
+++ b/bots/discord/discord.java/README.md
@@ -1,4 +1,5 @@
 # discord.java generic
+
 This egg is designed to run any generic Java application, allowing users to pull their own Java discord bot from a Github repository.
 
 There is an option to allow a user to upload their own files to run a bot.
@@ -6,14 +7,16 @@ There is an option to allow a user to upload their own files to run a bot.
 The startup configs and commands may need changing to actually function properly.
 
 ## Configuration
+
 The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running.
 ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png)
 
 You can use arrays to have multiple different values when different bots are being used
-```
+
+```json
 {
   "done":[
     "change this text 1",
     "change this text 2"
   ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/discord java/egg-discord-java.json b/bots/discord/discord.java/egg-discord-java.json
similarity index 100%
rename from bots/discord/discord java/egg-discord-java.json
rename to bots/discord/discord.java/egg-discord-java.json
diff --git a/bots/discord/discord.js/README.md b/bots/discord/discord.js/README.md
index cab8f28f..1d7a903d 100644
--- a/bots/discord/discord.js/README.md
+++ b/bots/discord/discord.js/README.md
@@ -7,11 +7,13 @@ There is an option to allow a user to upload their own files to run a bot.
 The startup configs and commands may need changing to actually function properly.
 
 ## Configuration
+
 The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running.
 ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png)
 
 You can use arrays to have multiple different values when different bots are being used
-```
+
+```json
 {
   "done":[
     "change this text 1",
diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json
index 0c38dc6f..3085b663 100644
--- a/bots/discord/discord.js/egg-discord-js-generic.json
+++ b/bots/discord/discord.js/egg-discord-js-generic.json
@@ -4,12 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-07T17:11:56+03:00",
+    "exported_at": "2021-10-22T07:43:48-04:00",
     "name": "discord.js generic",
     "author": "parker@parkervcp.com",
     "description": "a generic discord js bot egg\r\n\r\nThis will clone a git repo for a bot. it defaults to master if no branch is specified.\r\n\r\nInstalls the node_modules on install. If you set user_upload then I assume you know what you are doing.",
     "features": null,
     "images": [
+        "ghcr.io\/parkervcp\/yolks:nodejs_17",
         "ghcr.io\/parkervcp\/yolks:nodejs_16",
         "ghcr.io\/parkervcp\/yolks:nodejs_15",
         "ghcr.io\/parkervcp\/yolks:nodejs_14",
@@ -30,7 +31,8 @@
             "entrypoint": "bash"
         }
     },
-    "variables": [{
+    "variables": [
+        {
             "name": "Git Repo Address",
             "description": "GitHub Repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name",
             "env_variable": "GIT_ADDRESS",
@@ -55,7 +57,7 @@
             "default_value": "0",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         },
         {
             "name": "Auto Update",
diff --git a/bots/discord/discord.py/README.md b/bots/discord/discord.py/README.md
index 80b3ffb5..2a823146 100644
--- a/bots/discord/discord.py/README.md
+++ b/bots/discord/discord.py/README.md
@@ -1,4 +1,5 @@
 # discord.py generic
+
 This egg is designed to run any generic Python application, allowing users to pull their own Python discord bot from a Github repository.
 
 There is an option to allow a user to upload their own files to run a bot.
@@ -6,14 +7,16 @@ There is an option to allow a user to upload their own files to run a bot.
 The startup configs and commands may need changing to actually function properly.
 
 ## Configuration
+
 The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running.
 ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png)
 
 You can use arrays to have multiple different values when different bots are being used
-```
+
+```json
 {
   "done":[
     "change this text 1",
     "change this text 2"
   ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/discord.py/egg-discord-py-generic.json b/bots/discord/discord.py/egg-discord-py-generic.json
index d13e7b48..884599f6 100644
--- a/bots/discord/discord.py/egg-discord-py-generic.json
+++ b/bots/discord/discord.py/egg-discord-py-generic.json
@@ -4,12 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-07T17:13:40+03:00",
+    "exported_at": "2021-10-19T13:22:35-04:00",
     "name": "discord.py generic",
     "author": "parker@parkervcp.com",
     "description": "A Discord bot written in Python using discord.py\r\n\r\nhttps:\/\/github.com\/Ispira\/pixel-bot",
     "features": null,
     "images": [
+        "ghcr.io\/parkervcp\/yolks:python_3.10",
         "ghcr.io\/parkervcp\/yolks:python_3.9",
         "ghcr.io\/parkervcp\/yolks:python_3.8",
         "ghcr.io\/parkervcp\/yolks:python_3.7",
@@ -30,7 +31,8 @@
             "entrypoint": "bash"
         }
     },
-    "variables": [{
+    "variables": [
+        {
             "name": "Git Repo Address",
             "description": "Git repo to clone\r\n\r\nI.E. https:\/\/github.com\/parkervcp\/repo_name",
             "env_variable": "GIT_ADDRESS",
@@ -112,4 +114,4 @@
             "rules": "required|string"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/bots/discord/discordgo/README.md b/bots/discord/discordgo/README.md
index 02aaf500..9aaf837b 100644
--- a/bots/discord/discordgo/README.md
+++ b/bots/discord/discordgo/README.md
@@ -1,22 +1,25 @@
 # discordgo generic
+
 This egg is designed to run any generic Golang application, allowing users to pull their own Golang discord bot from a Github repository.
 
 The startup configs and commands may need changing to actually function properly.
 
 Users cannot upload their own code as this is built to build the resulting bot.
 
-`GO_PACKAGE` is the variable for the go repo i.e. `github.com/aurieh/ddg-ng`  
+`GO_PACKAGE` is the variable for the go repo i.e. `github.com/aurieh/ddg-ng`
 `EXECUTABLE` is the variable for the executable that is built i.e. `ddg-ng`
 
 ## Configuration
+
 The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running.
 ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png)
 
 You can use arrays to have multiple different values when different bots are being used
-```
+
+```json
 {
   "done":[
     "change this text 1",
     "change this text 2"
   ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/dynamica/README.md b/bots/discord/dynamica/README.md
new file mode 100644
index 00000000..ef2e45e4
--- /dev/null
+++ b/bots/discord/dynamica/README.md
@@ -0,0 +1,5 @@
+# Dynamica
+
+### Their [Github](https://github.com/dynamicabot/dynamica)
+
+This is a discord bot for dynamically managing voice channels.
diff --git a/bots/discord/dynamica/egg-dynamica.json b/bots/discord/dynamica/egg-dynamica.json
new file mode 100644
index 00000000..185beb40
--- /dev/null
+++ b/bots/discord/dynamica/egg-dynamica.json
@@ -0,0 +1,59 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-12-13T10:34:52+11:00",
+    "name": "Dynamica",
+    "author": "sebastian.pietschner@gmail.com",
+    "description": "The dynamica discord bot",
+    "features": null,
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:nodejs_16"
+    ],
+    "file_denylist": [],
+    "startup": "yarn deploy && yarn prisma migrate deploy && yarn start",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Ready! Logged in as \"\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "apt-get update\r\napt-get install openssl git -y -qq\r\ncd \/mnt\/server\r\nif [[ -d .git\/ ]]; then\r\n    git pull\r\nelse\r\n    git clone https:\/\/github.com\/dynamicabot\/dynamica.git .;\r\nfi;\r\nyarn install --frozen-lockfile",
+            "container": "node:lts-buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Database Path",
+            "description": "The path in which to create the sqlite database.",
+            "env_variable": "DATABASE_URL",
+            "default_value": "file:\/home\/container\/dynamica\/db.sqlite",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|string"
+        },
+        {
+            "name": "Token",
+            "description": "The token for the discord bot.",
+            "env_variable": "TOKEN",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string"
+        },
+        {
+            "name": "Client ID",
+            "description": "The client ID of your discord bot.",
+            "env_variable": "CLIENT_ID",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|size:18"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/bots/discord/fragbot/README.md b/bots/discord/fragbot/README.md
index 6ef6eedd..2ffdb8d7 100644
--- a/bots/discord/fragbot/README.md
+++ b/bots/discord/fragbot/README.md
@@ -1,8 +1,11 @@
 # fragbot
-### Their [Github](https://github.com/fragforce/fragbot)
-The golang based discord bot for fragforce. 
+
+## Their [Github](https://github.com/fragforce/fragbot)
+
+The golang based discord bot for fragforce.
 
 Runs the fragforce `@fragbot`
 
-### Server Ports
-There are no ports required for fragbot
\ No newline at end of file
+## Server Ports
+
+There are no ports required for fragbot
diff --git a/bots/discord/jmusicbot/README.md b/bots/discord/jmusicbot/README.md
index aabb1bb9..67c1252d 100644
--- a/bots/discord/jmusicbot/README.md
+++ b/bots/discord/jmusicbot/README.md
@@ -1,10 +1,94 @@
 # JMusicBot
-### Their [Github](https://github.com/jagrosh/MusicBot)
-A Discord music bot that's easy to set up and run yourself! 
 
-### Config
+___
 
-Edit the startup variables before starting the bot, otherwise it will fail to start
+## Authors / Contributors
 
-### Server Ports
-There are no ports required for JMusicBot
\ No newline at end of file
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+    <tr>
+        <td align="center">
+            <a href="https://github.com/jagrosh">
+                <img src="https://avatars.githubusercontent.com/u/12754382" width="50px;" alt=""/><br /><sub><b>John Grosh</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/jagrosh/MusicBot/commits?author=jagrosh" title="Codes">💻</a>
+            <a href="https://github.com/jagrosh/MusicBot/commits?author=jagrosh" title="Original Bot Creator">🤖</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/parkervcp">
+                <img src="https://avatars.githubusercontent.com/u/1207679" width="50px;" alt=""/><br /><sub><b>parkervcp</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=parkervcp" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=parkervcp" title="Original Egg Creator">🥚</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/Software-Noob">
+                <img src="https://avatars.githubusercontent.com/u/10975908" width="50px;" alt=""/><br /><sub><b>Software-Noob</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=Software-Noob" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=Software-Noob" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/Proxymiity">
+                <img src="https://avatars.githubusercontent.com/u/25194496" width="50px;" alt=""/><br /><sub><b>Proxymiity</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=Proxymiity" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=Proxymiity" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/lilkingjr1">
+                <img src="https://avatars.githubusercontent.com/u/4533989" width="50px;" alt=""/><br /><sub><b>Red-Thirten</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=lilkingjr1" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=iamkubi" title="Contributor">💡</a>
+        </td>
+    </tr>
+</table>
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+
+___
+
+## Bot Description & Features
+
+From the developer's [Github](https://github.com/jagrosh/MusicBot):
+> A Discord music bot that's easy to set up and run yourself!
+
+- Easy to run
+- Fast loading of songs
+- No external keys needed (besides a Discord Bot token)
+- Smooth playback
+- Server-specific setup for the "DJ" role that can moderate the music
+- Clean and beautiful menus
+- Supports many sites, including YouTube, Soundcloud, and more
+- Supports many online radio/streams
+- Supports local files
+- Playlist support (both web/youtube, and local)
+
+___
+
+## Configuration
+
+- If you can, edit the Startup Variables before starting the bot, because otherwise it will fail to start.
+- Most settings found in `config.txt` can be edited via the Startup Variables. Advanced settings not listed can still be edited manually via the File Manager. Available Startup Variables will take precedent over manual edits.
+
+___
+
+## Server Ports
+
+There are no ports required for JMusicBot.
+___
+
+## Updating
+
+Re-Installing the server via the panel will do the following:
+
+1. Update the bot to the latest version.
+2. Update the `config.txt` file to the latest version, and place the old one at `config.txt-old`.
+3. Any local songs will remain and not be touched.
diff --git a/bots/discord/jmusicbot/config.txt b/bots/discord/jmusicbot/config.txt
index 60e0c9cf..7ef90ec6 100644
--- a/bots/discord/jmusicbot/config.txt
+++ b/bots/discord/jmusicbot/config.txt
@@ -27,7 +27,6 @@ owner = 0
 // The prefix is used to control the commands
 // If you use !!, the play command will be !!play
 // If you do not set this, the prefix will be a mention of the bot (@Botname play)
-// If you make this blank, the bot will not use a prefix
 
 prefix = "@mention"
 
@@ -52,7 +51,7 @@ status = ONLINE
 // "Playing" status. Note that this will ONLY work if the bot is playing music on ONE guild;
 // if the bot is playing on multiple guilds, this will not work.
 
-songinstatus=false
+songinstatus = false
 
 
 // If you set this, the bot will also use this prefix in addition to
@@ -98,6 +97,11 @@ stayinchannel = false
 
 maxtime = 0
 
+// This sets the amount of seconds the bot will stay alone on a voice channel until it
+// automatically leaves the voice channel and clears the queue. If not set or set
+// to any number less than or equal to zero, the bot won't leave when alone.
+
+alonetimeuntilstop = 0
 
 // This sets an alternative folder to be used as the Playlists folder
 // This can be a relative or absolute path
@@ -108,11 +112,11 @@ playlistsfolder = "Playlists"
 // By default, the bot will DM the owner if the bot is running and a new version of the bot
 // becomes available. Set this to false to disable this feature.
 
-updatealerts=true
+updatealerts = true
 
 
 // Changing this changes the lyrics provider
-// Currently available providers: "A-Z Lyrics", "Genius", "MusicMatch"
+// Currently available providers: "A-Z Lyrics", "Genius", "MusicMatch", "LyricsFreak"
 // At the time of writing, I would recommend sticking with A-Z Lyrics or MusicMatch,
 // as Genius tends to have a lot of non-song results and you might get something 
 // completely unrelated to what you want.
diff --git a/bots/discord/jmusicbot/egg-j-music-bot.json b/bots/discord/jmusicbot/egg-j-music-bot.json
index 83cce79d..96da03ca 100644
--- a/bots/discord/jmusicbot/egg-j-music-bot.json
+++ b/bots/discord/jmusicbot/egg-j-music-bot.json
@@ -1,58 +1,130 @@
 {
-    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "_comment": "Pterodactyl JMusicBot Egg ~ parkervcp, Software-Noob, Proxymiity, and Red-Thirten ~ 2021-11-29",
     "meta": {
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-01-29T22:41:09+02:00",
     "name": "JMusicBot",
     "author": "parker@parkervcp.com",
     "description": "A Discord music bot that's easy to set up and run yourself!",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre"
+        "ghcr.io\/pterodactyl\/yolks:java_16"
     ],
-    "startup": "java -Djavax.accessibility.assistive_technologies=\" \" -Dnogui=true -jar JMusicBot.jar",
+    "file_denylist": [],
+    "startup": "java -Dnogui=true -jar JMusicBot.jar",
     "config": {
-        "files": "{\r\n    \"config.txt\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"token =\": \"token = \\\"{{env.BOT_TOKEN}}\\\"\",\r\n            \"prefix =\": \"prefix = \\\"{{env.BOT_PREFIX}}\\\"\",\r\n            \"owner =\": \"owner = \\\"{{env.BOT_OWNER}}\\\"\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"config.txt\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"token =\": \"token = \\\"{{server.build.env.BOT_TOKEN}}\\\"\",\r\n            \"owner =\": \"owner = {{server.build.env.BOT_OWNER}}\",\r\n            \"prefix =\": \"prefix = \\\"{{server.build.env.BOT_PREFIX}}\\\"\",\r\n            \"game =\": \"game = \\\"{{server.build.env.BOT_GAME}}\\\"\",\r\n            \"status =\": \"status = {{server.build.env.BOT_STATUS}}\",\r\n            \"songinstatus =\": \"songinstatus = {{server.build.env.BOT_SONG_STATUS}}\",\r\n            \"altprefix =\": \"altprefix = \\\"{{server.build.env.BOT_ALT_PREFIX}}\\\"\",\r\n            \"npimages =\": \"npimages = {{server.build.env.BOT_NPIMAGES}}\",\r\n            \"stayinchannel =\": \"stayinchannel = {{server.build.env.BOT_STAY_IN_CHANNEL}}\",\r\n            \"maxtime =\": \"maxtime = {{server.build.env.BOT_MAXTIME}}\",\r\n            \"alonetimeuntilstop =\": \"alonetimeuntilstop = {{server.build.env.BOT_ALONE_TIME}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Finished Loading\"\r\n}",
         "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n    echo -e \"no github user set, using anon api call\"\r\nelse\r\n    echo -e \"user and oauth token set\"\r\n    alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i config)\r\n    else\r\n        echo -e \"defaulting to the latest release\"\r\n        DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n    mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\n\r\ncurl -Lo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n    echo -e \"config already exists\"\r\nelse\r\n    echo -e \"config not found, downloading default config\"\r\n    curl -Lo config.txt ${CONFIG_LINK}\r\nfi\r\n\r\nif [ -f playlist.txt ]; then\r\n    echo -e \"playlist already exists\"\r\nelse\r\n    echo -e \"playlist not found, downloading default playlist\"\r\n    curl -Lo playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho \"Job's Done\"",
+            "script": "#!\/bin\/bash\r\n## this is a simple script to use the github API for release versions.\r\n## this requires the egg has a variable for GITHUB_PACKAGE and VERSION\r\n## this supports using oauth\/personal access tokens via GITHUB_USER and GITHUB_OAUTH_TOKEN (both are required.)\r\n## if you are getting hit with GitHub API limit issues then you need to have the user and token set.\r\n\r\napt update\r\napt install -y jq curl\r\n\r\nGITHUB_PACKAGE=\"jagrosh\/MusicBot\"\r\nCONFIG_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/config.txt\"\r\nPLAYLIST_LINK=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/bots\/discord\/jmusicbot\/example_playlist.txt\"\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n    echo -e \"No Github user set. Using anonymous API call...\"\r\nelse\r\n    echo -e \"User and OAuth token set.\"\r\n    alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i config)\r\n    else\r\n        echo -e \"Defaulting to the latest release.\"\r\n        DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n## JMusicBot Setup\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\necho -e \"\\nInstalling\/Updating JMusicBot...\\n\"\r\n\r\nif [ -f JMusicBot.jar ]; then\r\n    echo -e \"Updating JMusicBot.jar to latest version...\"\r\n    echo -e '\\t(Old version can be found at \"JMusicBot.jar-old\")'\r\n    mv -f JMusicBot.jar JMusicBot.jar-old\r\nfi\r\necho -e \"Running: curl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\\n\"\r\ncurl -sSLo JMusicBot.jar ${DOWNLOAD_LINK}\r\n\r\nif [ -f config.txt ]; then\r\n    echo -e \"Updating config.txt to latest version...\"\r\n    echo -e '\\t(Old version can be found at \"config.txt-old\")'\r\n    mv -f config.txt config.txt-old\r\nfi\r\necho -e \"Running: curl -sSLo config.txt ${CONFIG_LINK}\\n\"\r\ncurl -sSLo config.txt ${CONFIG_LINK}\r\n\r\n[ ! -d Playlists ] && mkdir Playlists\r\ncd Playlists\r\nif [ -f example_playlist.txt ]; then\r\n    echo -e \"example_playlist.txt already exists. Skipping default download.\"\r\nelse\r\n    echo -e \"example_playlist.txt not found. Downloading default example_playlist...\"\r\n    echo -e \"Running: curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\"\r\n    curl -sSLo example_playlist.txt ${PLAYLIST_LINK}\r\nfi\r\n\r\necho -e \"\\nJMusicBot Successfully Installed!\"",
             "container": "debian:buster-slim",
             "entrypoint": "\/bin\/bash"
         }
     },
     "variables": [
         {
-            "name": "Discord Bot Token",
-            "description": "The token for your discord bot.\r\n\r\nhttps:\/\/discord.com\/developers\/applications\/",
+            "name": "[REQUIRED] Discord Bot Token",
+            "description": "The token for your Discord bot. Learn how to obtain a token and configure your bot application properly here: https:\/\/jmusicbot.com\/getting-a-bot-token\/",
             "env_variable": "BOT_TOKEN",
             "default_value": "You need to get a token",
             "user_viewable": true,
             "user_editable": true,
             "rules": "required|string|max:64"
         },
+        {
+            "name": "[REQUIRED] Bot Owner ID",
+            "description": "This is the Discord User ID of the bot owner. Learn how to obtain this ID here: https:\/\/jmusicbot.com\/finding-your-user-id\/",
+            "env_variable": "BOT_OWNER",
+            "default_value": "Change This To Your Discord User ID",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|digits:18"
+        },
         {
             "name": "Bot Prefix",
-            "description": "The prefix for the bot.\r\n\r\nDefault is to @mention the bot.",
+            "description": "This sets the prefix for the bot. The prefix is used to control the commands. If you use !, the play command will be !play. If you do not set this, the prefix will be a mention of the bot (@Botname play).",
             "env_variable": "BOT_PREFIX",
             "default_value": "@mention",
             "user_viewable": true,
             "user_editable": true,
+            "rules": "nullable|string|max:20"
+        },
+        {
+            "name": "Bot Alternate Prefix",
+            "description": "If you set this, the bot will also use this prefix in addition to \"Bot Prefix\". Set to NONE to not have an alternate prefix.",
+            "env_variable": "BOT_ALT_PREFIX",
+            "default_value": "NONE",
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
-            "name": "Bot Owner ID",
-            "description": "This is the user ID of the bot owner. It's a long numeric ID, such as 4440512350692326306",
-            "env_variable": "BOT_OWNER",
-            "default_value": "Change This To Your Discord User ID",
+            "name": "Bot Default Game",
+            "description": "If you change this, it modifies the default game of the bot. Set this to NONE to have no game. Set this to DEFAULT to use the default game. You can make the game \"Playing X\", \"Listening to X\", or \"Watching X\" where X is the title. If you don't include an action, it will use the default of \"Playing\".",
+            "env_variable": "BOT_GAME",
+            "default_value": "DEFAULT",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:32"
+            "rules": "nullable|string|max:20"
+        },
+        {
+            "name": "Bot Default Status",
+            "description": "[ Accepted Values: ONLINE IDLE DND INVISIBLE ] Will modify the default status of bot.",
+            "env_variable": "BOT_STATUS",
+            "default_value": "ONLINE",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:ONLINE,IDLE,DND,INVISIBLE"
+        },
+        {
+            "name": "Bot Show Song in Status",
+            "description": "If you set this to true, the bot will list the title of the song it is currently playing in its \"Playing\" status. NOTE: This will ONLY work if the bot is playing music on ONE Discord server; if the bot is playing in multiple servers, this will not work!",
+            "env_variable": "BOT_SONG_STATUS",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Bot Show Images for \"Now Playing\"",
+            "description": "If set to true, the \"nowplaying\" command will show YouTube thumbnails. NOTE: If you set this to true, the nowplaying boxes will NOT refresh. This is because refreshing the boxes causes the image to be reloaded every time it refreshes.",
+            "env_variable": "BOT_NPIMAGES",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Bot Stay In Channel",
+            "description": "If set to true, the bot will not leave a voice channel after it finishes a queue. Keep in mind that being connected to a voice channel uses additional bandwidth, so this option is not recommended if bandwidth is a concern.",
+            "env_variable": "BOT_STAY_IN_CHANNEL",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Bot Alone Time Until Disconnect",
+            "description": "This sets the amount of seconds the bot will stay alone on a voice channel until it automatically leaves the voice channel and clears the queue. If not set or set to any number less than or equal to zero, the bot won't leave when alone.",
+            "env_variable": "BOT_ALONE_TIME",
+            "default_value": "0",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer"
+        },
+        {
+            "name": "Bot Max Song Length",
+            "description": "This sets the maximum amount of seconds any track loaded can be. If not set or set to any number less than or equal to zero, there is no maximum time length. This time restriction applies to songs loaded from any source.",
+            "env_variable": "BOT_MAXTIME",
+            "default_value": "0",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer"
         }
     ]
 }
\ No newline at end of file
diff --git a/bots/discord/jmusicbot/example_playlist.txt b/bots/discord/jmusicbot/example_playlist.txt
new file mode 100644
index 00000000..226bb714
--- /dev/null
+++ b/bots/discord/jmusicbot/example_playlist.txt
@@ -0,0 +1,21 @@
+# This is an example playlist
+# More information about playlists can be found here: https://jmusicbot.com/playlists/
+# Command to play this playlist: @Botname play playlist example_playlist
+# A new playlist can be made by making a new file in this directory called: my_playlist_name.txt
+
+# The following line currently makes the playlist shuffle
+# Remove this line entirely if you don't want shuffling
+#shuffle
+
+# Search Examples:
+ytsearch:gorillaz dare audio
+scsearch:lights metrognome
+
+# Direct Link Example:
+https://www.youtube.com/watch?v=dQw4w9WgXcQ
+
+# YouTube Playlist ID Example:
+PLUib4KwT0DMJaPgg_nr1ia8FY5JcXksvb
+
+# Local File Example:
+# /home/container/music/mysong.mp3
\ No newline at end of file
diff --git a/bots/discord/jmusicbot/playlist.txt b/bots/discord/jmusicbot/playlist.txt
deleted file mode 100644
index 86ca97de..00000000
--- a/bots/discord/jmusicbot/playlist.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# THIS IS AN EXAMPLE PLAYLIST, EDIT TI TO YOUR OWN REQUIREMENTS
-# jagrosh's playlist
-# lots of formats are supported, as shown below
-# JustSomeBots playlist format is supported as well
-
-# This next line (the word "shuffle" on a comment line) makes it so that the playlist is always shuffled when loaded.
-
-# shuffle
-
-
-# examples of searches on youtube
-ytsearch:juicy fruit williams
-ytsearch:gorillaz dare audio
-
-# examples of searches on soundcloud
-scsearch:lights metrognome
-
-# examples of specific youtube videos
-https://www.youtube.com/watch?v=x7ogV49WGco
-
-# examples of youtube playlists
-PLUib4KwT0DMJaPgg_nr1ia8FY5JcXksvb
-
-
-# Lots of formats are supported
-# #############################
-# Links (to youtube videos, soundcloud, radio, streams, etc)
-# Searches (prefixed with ytsearch or scsearch as shown above)
-# Youtube video or playlist IDs
-# Youtube playlist links (https://github.com/jagrosh/MusicBot/wiki/Playlists)
-# Local files (/home/container/music/mysong.mp3)
\ No newline at end of file
diff --git a/bots/discord/lua/luvit/README.md b/bots/discord/lua/luvit/README.md
index 8c51a6c3..5a4114c2 100644
--- a/bots/discord/lua/luvit/README.md
+++ b/bots/discord/lua/luvit/README.md
@@ -4,4 +4,4 @@ This egg was designed to allow a user to pull their own lua discord bot from a r
 
 There is an option to allow a user to upload their own files to run a bot.
 
-The startup configs and commands may need changing to actually function properly.
\ No newline at end of file
+The startup configs and commands may need changing to actually function properly.
diff --git a/bots/discord/lua/luvit/egg-luvit-generic.json b/bots/discord/lua/luvit/egg-luvit-generic.json
index ecdb6564..99a651dd 100644
--- a/bots/discord/lua/luvit/egg-luvit-generic.json
+++ b/bots/discord/lua/luvit/egg-luvit-generic.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-03-30T02:11:23+00:00",
+    "exported_at": "2022-01-22T05:40:57-05:00",
     "name": "luvit generic",
     "author": "parker@parkervcp.com",
     "description": "A generic luvit egg This will clone a git repo for a bot. It defaults to master if no branch is specified.\r\n\r\nSupports the discordia lua framework.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/luvit {{LUA_FILE}}",
@@ -62,7 +62,7 @@
             "default_value": "0",
             "user_viewable": true,
             "user_editable": false,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         },
         {
             "name": "Git Branch",
@@ -92,4 +92,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/nodemon.js/README.md b/bots/discord/nodemon.js/README.md
index 4b4f695b..c50d7e1a 100644
--- a/bots/discord/nodemon.js/README.md
+++ b/bots/discord/nodemon.js/README.md
@@ -11,11 +11,13 @@ There is an option to allow a user to upload their own files to run a bot.
 The startup configs and commands may need changing to actually function properly.
 
 ## Configuration
+
 The server will be stuck as `starting` until the egg Start Configuration is modified. You have to edit the text to match something your bot will print for Pterodactyl panel to detect it as running.
 ![image](https://user-images.githubusercontent.com/10975908/126516861-c5cb4630-9f25-405c-8199-97bf5ec15a7f.png)
 
 You can use arrays to have multiple different values when different bots are being used
-```
+
+```json
 {
   "done":[
     "change this text 1",
diff --git a/bots/discord/nodemon.js/egg-nodemon.json b/bots/discord/nodemon.js/egg-nodemon.json
index 337f24f2..6a903e3a 100644
--- a/bots/discord/nodemon.js/egg-nodemon.json
+++ b/bots/discord/nodemon.js/egg-nodemon.json
@@ -55,7 +55,7 @@
             "default_value": "0",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         },
         {
             "name": "Auto Update",
diff --git a/bots/discord/parkertron/README.md b/bots/discord/parkertron/README.md
index e66546f7..24975d02 100644
--- a/bots/discord/parkertron/README.md
+++ b/bots/discord/parkertron/README.md
@@ -1,8 +1,11 @@
 # parkertron
-### Their [Github](https://github.com/parkervcp/parkertron)
-Purely a chatbot. Not even a smart one. 
+
+## Their [Github](https://github.com/parkervcp/parkertron)
+
+Purely a chatbot. Not even a smart one.
 
 Runs the Pterodactyl `@support bot`
 
-### Server Ports
-There are no ports required for parkertron
\ No newline at end of file
+## Server Ports
+
+There are no ports required for parkertron
diff --git a/bots/discord/pixelbot/README.md b/bots/discord/pixelbot/README.md
index 4726344e..99c92060 100644
--- a/bots/discord/pixelbot/README.md
+++ b/bots/discord/pixelbot/README.md
@@ -1,9 +1,13 @@
 # pixelbot
-### Their [Github](https://github.com/possatti/pixelbot)
-Bot for pixelcanvas.io 
 
-### Server Ports
+## Their [Github](https://github.com/possatti/pixelbot)
+
+Bot for pixelcanvas.io
+
+## Server Ports
+
 There are no ports required for pixelbot
 
-### Side notes
-This was to make sure the parkervcp/images:python 3 image worked.
\ No newline at end of file
+## Side notes
+
+This was to make sure the parkervcp/images:python 3 image worked.
diff --git a/bots/discord/redbot/README.md b/bots/discord/redbot/README.md
index 6dfd2521..64a78c16 100644
--- a/bots/discord/redbot/README.md
+++ b/bots/discord/redbot/README.md
@@ -1,15 +1,20 @@
 # Red-DiscordBot
-### From their [Github](https://github.com/Cog-Creators/Red-DiscordBot)
-A multifunction Discord bot 
 
-### Server Ports
+## From their [Github](https://github.com/Cog-Creators/Red-DiscordBot)
+
+A multifunction Discord bot
+
+## Server Ports
+
 No port are required to run Red.
 
 if you want to use the internal Lavalink Server, you need to allocate port 2333 as primary
 
-### Additional Requirements
-When using the Audio Cog the bot will attempt to save files to /tmp resulting in a disk space error.  To resolve this error you must increase the size of `tmpfs` using custom container policy.
+## Additional Requirements
 
-For additional details see: https://pterodactyl.io/daemon/0.6/configuration.html#container-policy
+When using the Audio Cog the bot will attempt to save files to /tmp resulting in a disk space error.  You may also see this same error when attempting to install a cog, due to pip using /tmp to build the requirements.  To resolve this error you must increase the size of `tmpfs` using custom container policy.
 
-#### Mods/Plugins may require ports to be added to the server.
+For additional details see:
+<https://pterodactyl.io/wings/1.0/configuration.html#other-values>
+
+### Mods/Plugins may require ports to be added to the server
diff --git a/bots/discord/sinusbot/README.md b/bots/discord/sinusbot/README.md
index 9fe05294..81ab0f0f 100644
--- a/bots/discord/sinusbot/README.md
+++ b/bots/discord/sinusbot/README.md
@@ -1,15 +1,19 @@
 # SinusBot
-### Their [Site](https://www.sinusbot.com/)
-Listen to your favorite music together with all of your friends  
 
-Welcome the Simple, Elegant & great sounding TS3- and Discord-Bot!  
+## Their [Site](https://www.sinusbot.com/)
+
+Listen to your favorite music together with all of your friends
+
+Welcome the Simple, Elegant & great sounding TS3- and Discord-Bot!
+
+## Server Ports
 
-### Server Ports
 1 port is required to run SinusBot.
 
 | Port    | default |
 |---------|---------|
 | Game    | 8087    |
 
-### Side notes
-This uses a custom image.
\ No newline at end of file
+## Side notes
+
+This uses a custom image.
diff --git a/bots/discord/sinusbot/egg-sinusbot.json b/bots/discord/sinusbot/egg-sinusbot.json
index fa050d60..c57601cc 100644
--- a/bots/discord/sinusbot/egg-sinusbot.json
+++ b/bots/discord/sinusbot/egg-sinusbot.json
@@ -1,13 +1,18 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-07-25T10:48:45-04:00",
+    "exported_at": "2022-02-06T02:44:05+02:00",
     "name": "Sinusbot",
     "author": "support@pterodactyl.io",
     "description": "Musicbot for Discord and Teamspeak.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:bot_sinusbot",
+    "features": null,
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:bot_sinusbot"
+    ],
+    "file_denylist": [],
     "startup": ".\/sinusbot --override-password=\"${OVERRIDE_PASSWORD}\"",
     "config": {
         "files": "{\r\n    \"config.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ListenPort\": \"ListenPort = {{server.build.default.port}}\",\r\n            \"ListenHost\": \"ListenHost = \\\"0.0.0.0\\\"\"\r\n        }\r\n    }\r\n}",
@@ -17,7 +22,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dl\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dl\/youtube-dl\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dl\r\ncd \/mnt\/server\/youtube-dl\r\nwget -q https:\/\/yt-dl.org\/downloads\/latest\/youtube-dl\r\nchmod a+rx youtube-dl",
+            "script": "#!\/bin\/bash\r\n# Sinusbot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install ca-certificates bzip2 wget tar curl jq\r\napt -q clean all\r\n\r\n#Create needed directories\r\nmkdir -p \/mnt\/server\/TeamSpeak3-Client-linux_amd64\/plugins\r\nmkdir \/mnt\/server\/youtube-dlp\r\n\r\ncd \/mnt\/server\r\n\r\n#Download Sinusbot\r\nwget -qO - https:\/\/www.sinusbot.com\/dl\/sinusbot.current.tar.bz2 | tar xj\r\n\r\n#Download Latest TeamSpeak Client\r\nTS_VERSION=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.version')\r\nTS_DL_LINK=$(curl https:\/\/teamspeak.com\/versions\/client.json | jq -r '.linux.x86_64.mirrors.\"teamspeak.com\"')\r\n\r\necho -e \"downloading teamspeak version ${TS_VERSION}\"\r\necho -e \"running 'wget ${TS_DL_LINK}'\"\r\n\r\nwget ${TS_DL_LINK}\r\n\r\n# Install TeamSpeak Client\r\nchmod 0755 TeamSpeak3-Client-linux_amd64*.run\r\n.\/TeamSpeak3-Client-linux_amd64*.run --tar xfv -C TeamSpeak3-Client-linux_amd64\r\n\r\n## Cleaning up \r\n\r\nrm TeamSpeak3-Client-linux_amd64*.run\r\n# Remove glx-integration lib\r\nrm TeamSpeak3-Client-linux_amd64\/xcbglintegrations\/libqxcb-glx-integration.so\r\n\r\n#Install Sinusbot\r\nchmod +x sinusbot\r\ncp config.ini.dist config.ini\r\nsed -i \"s|^TS3Path.*|TS3Path = \\\"\/home\/container\/TeamSpeak3-Client-linux_amd64\/ts3client_linux_amd64\\\"|g\" config.ini\r\necho 'YoutubeDLPath = \"\/home\/container\/youtube-dlp\/youtube-dlp\"' >> config.ini\r\n\r\n#Install Sinusbot plugin\r\ncp plugin\/libsoundbot_plugin.so TeamSpeak3-Client-linux_amd64\/plugins\r\n\r\n#Download youtube-dlp\r\ncd \/mnt\/server\/youtube-dlp\r\nwget https:\/\/github.com\/yt-dlp\/yt-dlp\/releases\/latest\/download\/yt-dlp -O youtube-dlp\r\nchmod a+rx youtube-dlp",
             "container": "ubuntu:18.04",
             "entrypoint": "bash"
         }
@@ -28,8 +33,8 @@
             "description": "Password for admin account.",
             "env_variable": "OVERRIDE_PASSWORD",
             "default_value": "CHANGEME",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         }
     ]
diff --git a/bots/other/bigbrotherbot/README.md b/bots/other/bigbrotherbot/README.md
index 7ff6f9e6..27580e60 100644
--- a/bots/other/bigbrotherbot/README.md
+++ b/bots/other/bigbrotherbot/README.md
@@ -1,8 +1,11 @@
 # Big Brother Bot
-### From their [Github](https://github.com/BigBrotherBot/big-brother-bot)
-Big Brother Bot B3 is a complete and total server administration package for online games. B3 is designed primarily to keep your server free from the derelicts of online gaming, but offers more, much more  
 
-### Server Ports
+## From their [Github](https://github.com/BigBrotherBot/big-brother-bot)
+
+Big Brother Bot B3 is a complete and total server administration package for online games. B3 is designed primarily to keep your server free from the derelicts of online gaming, but offers more, much more
+
+## Server Ports
+
 No ports are required to run Big Brother Bot. You can assign a random port to the bot.
 
-#### Mods/Plugins may require ports to be added to the server.
\ No newline at end of file
+### Mods/Plugins may require ports to be added to the server
diff --git a/bots/teamspeak3/README.md b/bots/teamspeak3/README.md
index f430ca9f..f6362c22 100644
--- a/bots/teamspeak3/README.md
+++ b/bots/teamspeak3/README.md
@@ -1,7 +1,8 @@
 # TeamSpeak3 Bots
 
-### Some of these bots support other services but are primarily TeamSpeak3 bots
+## Some of these bots support other services but are primarily TeamSpeak3 bots
 
-#### JTS3ServerMod
-[JTS3ServerMod](https://www.stefan1200.de/forum/index.php?topic=2.0)  
-Please Check their site for an in depth on the bot.
\ No newline at end of file
+### [JTS3ServerMod](jts3servermod)
+
+[JTS3ServerMod](https://www.stefan1200.de/forum/index.php?topic=2.0)
+Please Check their site for an in depth on the bot.
diff --git a/bots/twitch/README.md b/bots/twitch/README.md
index 8c12388f..365ec895 100644
--- a/bots/twitch/README.md
+++ b/bots/twitch/README.md
@@ -1,6 +1,15 @@
 # Twitch Bots
 
-### Some of these bots support other services but are primarily Twitch bots
+## Some of these bots support other services but are primarily Twitch bots
 
-#### PhantomBot [Homepage](https://phantombot.github.io/PhantomBot/) [Egg](/bots/twitch/phantombot/)
-#### sogeBot [Homepage](https://sogebot.xyz) [Egg](/bots/twitch/sogebots/)
+### [PhantomBot](phantombot)
+
+[Website](https://phantombot.github.io/PhantomBot/)
+[GitHub](https://github.com/phantombot/PhantomBot)
+PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers.
+
+### [SogeBot](sogebot)
+
+[Website](https://sogebot.xyz)
+[GitHub](https://github.com/sogebot/sogeBot)
+Free Twitch Bot built on Node.js
diff --git a/bots/twitch/phantombot/README.md b/bots/twitch/phantombot/README.md
index de58899c..ab9e186f 100644
--- a/bots/twitch/phantombot/README.md
+++ b/bots/twitch/phantombot/README.md
@@ -1,10 +1,11 @@
 # PhantomBot
-### Their [Site](https://phantombot.github.io/PhantomBot/)
-PhantomBot is an actively developed open source interactive Twitch bot
-with a vibrant community that provides entertainment and moderation for your channel,
-allowing you to focus on what matters the most to you - your game and your viewers.
 
-### Server Ports
+[WebSite](https://phantombot.github.io/PhantomBot/)
+[GitHub](https://github.com/phantombot/PhantomBot)
+PhantomBot is an actively developed open source interactive Twitch bot with a vibrant community that provides entertainment and moderation for your channel, allowing you to focus on what matters the most to you - your game and your viewers.
+
+## Server Ports
+
 3 ports are required to run PhantomBot.
 
 | Port                | default |
@@ -13,7 +14,8 @@ allowing you to focus on what matters the most to you - your game and your viewe
 | YoutubeSocketServer | 25003   |
 | PanelSocketServer   | 25004   |
 
-# NOTES
+### NOTES
+
 You need to define one main port and the other 2 port need to be +3 and +4!
 
 Example:
diff --git a/bots/twitch/sogebot/README.md b/bots/twitch/sogebot/README.md
index c2c82425..02a15492 100644
--- a/bots/twitch/sogebot/README.md
+++ b/bots/twitch/sogebot/README.md
@@ -1,15 +1,17 @@
 # SogeBot
-### Their [Site](https://www.sogebot.xyz)
-sogeBot is an actively developed open source interactive Twitch bot that provides entertainment and moderation for your channel,
-allowing you to focus on what matters the most to you - your game and your viewers.
 
-### Server Ports
+[Website](https://sogebot.xyz)
+[GitHub](https://github.com/sogebot/sogeBot)
+Free Twitch Bot built on Node.js
+
+## Server Ports
+
 1 port is required to run sogeBot.
 
 | Port                | default |
 |---------------------|---------|
 | Game (HTTP Server)  | 20000   |
 
-#NOTES
+## NOTES
 
 The installation take a long time, because a lot of things must be compiled. It can take 5 or more minutes !!!
diff --git a/bots/twitch/sogebot/egg-soge-bot.json b/bots/twitch/sogebot/egg-soge-bot.json
index 8cd97ef6..8a989269 100644
--- a/bots/twitch/sogebot/egg-soge-bot.json
+++ b/bots/twitch/sogebot/egg-soge-bot.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-04T05:39:15+03:00",
+    "exported_at": "2021-12-13T15:19:16+01:00",
     "name": "SogeBot",
     "author": "info@goover.de",
     "description": "sogeBot - Free Twitch Bot built on Node.js https:\/\/sogebot.xyz\/",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-16"
+        "ghcr.io\/parkervcp\/yolks:nodejs_16"
     ],
     "file_denylist": [],
     "startup": "npm start",
@@ -22,15 +22,15 @@
     },
     "scripts": {
         "installation": {
-            "script": "#\/bin\/bash\r\napt -y update\r\napt install -y curl unzip sqlite jq wget python3 build-essential\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\nrm -fR dest\r\nrm -fR public\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogehige\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogehige\/sogeBot\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\n\/usr\/local\/bin\/npm ci 2>&1 | tee npmlog.txt\r\n\r\nexit 0",
-            "container": "node:16-buster-slim",
+            "script": "#\/bin\/bash\r\n# Installscript for sogeBot | Author: info@goover.de\r\n\r\nexport DEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\napt install -y curl unzip sqlite3 jq wget python3 build-essential ca-certificates\r\n\r\nexport NODE_OPTIONS=--max-old-space-size=8192\r\nchown -R root:root \/mnt\r\nMATCH=sogeBot\r\ncd \/mnt\/server\r\n\r\n#Backup database & config\r\nmkdir -p .backup\r\ncp -f .env \/mnt\/server\/.backup\r\ncp -f sogebot.db \/mnt\/server\/.backup\r\n\r\n#delete old dir's to prevent errors on update\r\nrm -fR dest\r\nrm -fR public\r\nrm -fR node-modules\r\nrm -fR tools\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/sogebot\/sogeBot\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\necho -e \"Downloading from $DOWNLOAD_LINK\"\r\nwget -N $DOWNLOAD_LINK\r\nunzip -o $MATCH-*.zip\r\nrm -fR $MATCH-*.zip\r\n\r\necho \"--------------------------------------------------------------------------\"\r\necho \"Installing dependencies, this will take some time so sit back and relax...\"\r\necho \"IGNORE WARNINGS. THESE ARE NOT ERRORS !!!\"\r\necho \"--------------------------------------------------------------------------\"\r\n\r\nnpm ci 2>&1 | tee npmlog.txt\r\n\r\necho -e \"install completed\"\r\nexit 0",
+            "container": "node:16-bullseye-slim",
             "entrypoint": "bash"
         }
     },
     "variables": [
         {
             "name": "Version",
-            "description": "Choose Version, you want to install. Default: Latest",
+            "description": "Version to install. Latest will install the latest available version.",
             "env_variable": "VERSION",
             "default_value": "latest",
             "user_viewable": true,
diff --git a/database/README.md b/database/README.md
index 0c58f9a3..9efc7435 100644
--- a/database/README.md
+++ b/database/README.md
@@ -1,16 +1,23 @@
 # databases
 
 ## In-Memory Databases
+
 ### [redis](/redis/)
+
     https://redis.io/
 
 ## NoSQL
+
 ### [mongodb](/nosql/mongodb/)
+
     https://www.mongodb.com/
 
 ## SQL Databases
+
 ### [mariadb](/sql/mariadb/)
+
     https://mariadb.org/
 
 ### [postgres](/sql/postgres/)
-    https://www.postgresql.org/
\ No newline at end of file
+
+    https://www.postgresql.org/
diff --git a/database/nosql/mongodb/README.md b/database/nosql/mongodb/README.md
index 9a2f5090..0a6415ae 100644
--- a/database/nosql/mongodb/README.md
+++ b/database/nosql/mongodb/README.md
@@ -1,12 +1,15 @@
 # mongoDB
-### From their [Website](https://www.mongodb.com/)
-MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era. 
 
-### Minimum RAM warning
+## From their [Website](https://www.mongodb.com/)
+
+MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.
+
+## Minimum RAM warning
+
 MongoDB requires approximately 1GB of RAM per 100.000 assets. If the system has to start swapping memory to disk, this will have a severely negative impact on performance, and should be avoided.
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/database/nosql/mongodb/egg-mongo-d-b.json b/database/nosql/mongodb/egg-mongo-d-b.json
index bf1ede28..311f157b 100644
--- a/database/nosql/mongodb/egg-mongo-d-b.json
+++ b/database/nosql/mongodb/egg-mongo-d-b.json
@@ -8,7 +8,7 @@
     "author": "parker@parkervcp.com",
     "description": "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for my butt era.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:db_mongo-4",
-    "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}",
+    "startup": "mongod --fork --dbpath \/home\/container\/mongodb\/ --port ${SERVER_PORT} --bind_ip 0.0.0.0 --logpath \/home\/container\/logs\/mongo.log -f \/home\/container\/mongod.conf; until nc -z -v -w5 127.0.0.1 ${SERVER_PORT}; do echo 'Waiting for mongodb connection...'; sleep 5; done && mongo --username ${MONGO_USER} --password ${MONGO_USER_PASS} --host 127.0.0.1:${SERVER_PORT} && mongo --eval \"db.getSiblingDB('admin').shutdownServer()\" 127.0.0.1:${SERVER_PORT}",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"child process started successfully\"\r\n}",
@@ -42,4 +42,4 @@
             "rules": "required|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/database/redis/redis-5/README.md b/database/redis/redis-5/README.md
index 4c89fc87..3531c1d1 100644
--- a/database/redis/redis-5/README.md
+++ b/database/redis/redis-5/README.md
@@ -1,14 +1,17 @@
 # Redis
-### From their [Website](https://redis.io/)
+
+## From their [Website](https://redis.io/)
+
 Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 It's recommended to have 4gb of RAM for redis
 
-See here https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/
+See here <https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/>
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/database/redis/redis-6/README.md b/database/redis/redis-6/README.md
index 4c89fc87..3531c1d1 100644
--- a/database/redis/redis-6/README.md
+++ b/database/redis/redis-6/README.md
@@ -1,14 +1,17 @@
 # Redis
-### From their [Website](https://redis.io/)
+
+## From their [Website](https://redis.io/)
+
 Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 It's recommended to have 4gb of RAM for redis
 
-See here https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/
+See here <https://docs.redislabs.com/latest/rs/administering/designing-production/hardware-requirements/>
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/database/sql/mariadb/README.md b/database/sql/mariadb/README.md
index 10acde47..51c8f277 100644
--- a/database/sql/mariadb/README.md
+++ b/database/sql/mariadb/README.md
@@ -1,15 +1,18 @@
 # MariaDB
-### From their [Website](https://mariadb.org/)
-One of the most popular database servers. Made by the original developers of MySQL.  
-Guaranteed to stay open source. 
 
-### Minimum RAM warning
+## From their [Website](https://mariadb.org/)
+
+One of the most popular database servers. Made by the original developers of MySQL.
+Guaranteed to stay open source.
+
+## Minimum RAM warning
+
 There is no actual minimum suggested for MariaDB.
 
-See here https://mariadb.com/kb/en/library/mariadb-hardware-requirements/
+See here <https://mariadb.com/kb/en/library/mariadb-hardware-requirements/>
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/database/sql/postgres/README.md b/database/sql/postgres/README.md
index 68feb186..317c23e5 100644
--- a/database/sql/postgres/README.md
+++ b/database/sql/postgres/README.md
@@ -1,14 +1,17 @@
 # PostgreSQL
-### From their [Website](https://www.postgresql.org/)
-The World's Most Advanced Open Source Relational Database 
 
-### Minimum RAM warning
+## From their [Website](https://www.postgresql.org/)
+
+The World's Most Advanced Open Source Relational Database
+
+## Minimum RAM warning
+
 2 Gigabytes minimum recommended
 
-See here https://www.commandprompt.com/blog/postgresql_mininum_requirements/
+See here <https://www.commandprompt.com/blog/postgresql_mininum_requirements/>
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/example/README.md b/example/README.md
index 94d7f62b..5b9852aa 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,20 +1,46 @@
 # Example Server Name
-### From their [Github](https://github.com/parkervcp/eggs)
-A link to the site that you download game files from.  
-The description of the server usually provided by the game/server maker.  
 
-### Install notes
-Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.
+<!--Please remove these comments and irelevent parts for the server egg your adding before summiting a PR request-->
+
+## From their [Github](https://github.com/parkervcp/eggs)
+
+A link to the site that you download the server files from.
+
+## [Documentation](https://github.com/parkervcp/eggs/blob/master/README.md)
+
+A link to relevent documentation for the server.
+
+The description of the server usually provided by the game/server maker.
+<!--Example: Parkers Pterodactyl Eggs Repo. Server eggs for the Pterodactyl management panel-->
+
+## Install notes
+
+<!--Make a note if the user needs to get any keys or other items to run/use the server-->
+Due to rate limiting the console on the panel, it cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.
+
+## Minimum RAM warning
 
-### Minimum RAM warning
 Minimum required memory to run the server.
+<!--Example: 2GB is recommended. 4GB+ is preferred-->
 
+## Minumim Sorage warning
+
+Minimum required storage to run the server.
+<!--Example: 10GB is recommended. 25GB+ is preferred-->
+
+<!--Make a note if the install script would require more then the above amounts-->
+
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
 |---------|---------|
 | Game    | 25565   |
 
-#### Mods/Plugins may require ports to be added to the server.
+### Notes
+
+<!--Notes about the server ports.-->
+25565 is the default port, but any port can be used.
+
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/README.md b/game_eggs/README.md
index 06df3977..5458c143 100644
--- a/game_eggs/README.md
+++ b/game_eggs/README.md
@@ -1,62 +1,69 @@
-## Game Eggs
+# Game Eggs
+
 [Among Us](among_us)
+
 * [Impostor Server](among_us/impostor_server)
 * [CrewLink Server](among_us/crewlink_server)
 
 [BeamNG.drive](beamng)
+
 * [BeamMP Server](beamng/beammp)
 * [KissMP](beamng/kissmp)
 
-[Cryofall](cryofall/cryofall)
+[ClassiCube](game_eggs/classicube)
+
+* [MCGalaxy](game_eggs/classicube/mcgalaxy)
 
 [Call of Duty 4X](cod/cod4x)
 
 [ET Legacy](enemy_territory/etlegacy)
 
-[FTL: Tachyon](ftl/tachyon)
-
 [Factorio](factorio)
+
 * [Vanilla](factorio/factorio)
 * [ModUpdate](factorio/factorio-modupdate)
 
+[FTL: Tachyon](ftl/tachyon)
+
 [Grand Theft Auto](gta)
+
 * GTA V
   * [FiveM](gta/fivem)
   * [RageMP](gta/ragemp)
   * [alt:V](gta/altv)
-  
+
 * GTA SA
   * [Multi Theft Auto](gta/mtasa)
   * [SA-MP](gta/samp)
-  
+
 * GTA
   * [GTAC](gta/gtac)
 
-[Mindustry](mindustry)
-  * [Mindustry](mindustry/mindustry)
-
 [League Sandbox](leaguesandbox)
-  * [League Sandbox](leaguesandbox/leaguesandbox)
 
-[Minetest](minetest) (including MTG)
-  * [Minetest](minetest/minetest)
+[Mindustry](mindustry)
 
 [Minecraft](minecraft)
+
 * [Bedrock](minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console)
   * [Bedrock](minecraft/bedrock/bedrock)
   * [gomint](minecraft/bedrock/gomint)
-  * [Nukkit](minecraft/bedrock/nukkit)  
-  * [PocketMine MP](minecraft/bedrock/pocketmine_mp)  
+  * [Nukkit](minecraft/bedrock/nukkit)
+  * [PocketMine MP](minecraft/bedrock/pocketmine_mp)
 
 * [Java](minecraft/java) Servers for Java Minecraft
   * [Airplane](minecraft/java/airplane)
   * [Cuberite](minecraft/java/cuberite)
-  * [Fabric](minecraft/java/fabric) 
-  * [Feather](minecraft/java/feather)  
-  * [Feed The Beast](minecraft/java/ftb)  
-  * [Forge](minecraft/java/forge)  
+  * [CusreForge Generic](minecraft/java/forge/curseforge-generic)
+  * [Fabric](minecraft/java/fabric)
+  * [Feather](minecraft/java/feather)
+  * [Forge](minecraft/java/forge)
+  * [Glowstone](minecraft/java/glowstone)
+  * [Feed The Beast](minecraft/java/ftb)
+  * [Krypton](/minecraft/java/krypton)
   * [Magma](minecraft/java/magma)
   * [Mohist](minecraft/java/mohist)
+  * [NanoLimbo](/minecraft/java/nanolimbo)
   * [Paper](minecraft/java/paper)
   * [Purpur](minecraft/java/purpur)
   * [Spigot](minecraft/java/spigot)
@@ -67,28 +74,37 @@
   * [VanillaCord](minecraft/java/vanillacord)
 
 * [Proxies](minecraft/proxy) Minecraft Server Proxies
-  * [Java](minecraft/proxy/java)
-	* [FlameCord](minecraft/proxy/java/flamecord)
-    * [Travertine](minecraft/proxy/java/travertine)
-    * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo)
-    * [Velocity](minecraft/proxy/java/velocity)
-    * [Waterfall](minecraft/proxy/java/waterfall)
+  * [Bedrock](minecraft/proxy/bedrock)
+    * [Waterdog PE](minecraft/proxy/bedrock/waterdog_pe)
   * [Cross Platform](minecraft/proxy/cross_platform)
     * [GeyserMC](minecraft/proxy/cross_platform/geyser)
     * [Waterdog](minecraft/proxy/cross_platform/waterdog)
+  * [Java](minecraft/proxy/java)
+    * [FlameCord](minecraft/proxy/java/flamecord)
+    * [Travertine](minecraft/proxy/java/travertine)
+    * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo)
+    * [Velocity](minecraft/proxy/java/velocity)
+    * [VIAaas](minecraft/proxy/java/viaaas)
+    * [Waterfall](minecraft/proxy/java/waterfall)
 
-[OpenArena](openarena)  
-  * [openarena](openarena/openarena) 
+[Minetest](minetest) (including MTG)
+
+[OpenArena](openarena)
 
 [OpenRA](openra)
+
 * [OpenRA Dune2000](openra/openra_dune2000)
 * [OpenRA Red Alert](openra/openra_red_alert)
 * [OpenRA Tiberian Dawn](openra/openra_tiberian_dawn)
 
 [Red Dead Redemption](rdr)
+
 * [RedM](rdr/redm)
 
+[Starmade](starmade)
+
 [SteamCMD Servers](steamcmd_servers) These eggs use SteamCMD to install
+
 * [7 Days to Die](steamcmd_servers/7_days_to_die)
 * [ARK: Survival Evolved](steamcmd_servers/ark_survival_evolved)
 * [Arma](steamcmd_servers/arma)
@@ -98,6 +114,7 @@
 * [Barotrauma](steamcmd_servers/barotrauma)
 * [Citadel: Forged with Fire](steamcmd_servers/citadel)
 * [Conan Exiles](steamcmd_servers/conan_exiles)
+* [CryoFall](steamcmd_servers/cryofall)
 * [Don't Starve Together](steamcmd_servers/dont_starve)
 * [ECO](steamcmd_servers/eco)
 * [Fistful of Frags](steamcmd_servers/fof)
@@ -106,6 +123,8 @@
 * [Hurtworld](steamcmd_servers/hurtworld)
 * [Insurgency: Sandstorm](steamcmd_servers/insurgency_sandstorm)
 * [Killing Floor 2](steamcmd_servers/killing_floor_2)
+* [Left 4 Dead](steamcmd_servers/left4dead)
+* [Left 4 Dead 2](steamcmd_servers/left4dead_2)
 * [Modiverse](steamcmd_servers/modiverse)
 * [Mordhau](steamcmd_servers/mordhau)
 * [No More Room in Hell](steamcmd_servers/nmrih)
@@ -120,9 +139,11 @@
 * [Rust](steamcmd_servers/rust)
   * [Autowipe](steamcmd_servers/rust/rust_autowipe)
   * [Staging](steamcmd_servers/rust/rust_staging)
+* [Satisfactory](steamcmd_servers/satisfactory)
 * [SCP: Secret Laboratory](steamcmd_servers/scpsl)
-  * [dedicated](steamcmd_servers/scpsl/dedicated)
-  * [multiadmin](steamcmd_servers/scpsl/multiadmin)
+  * [Dedicated](steamcmd_servers/scpsl/dedicated)
+  * [Exiled](steamcmd_servers/scpsl/exiled)
+  * [Multiadmin](steamcmd_servers/scpsl/multiadmin)
 * [Soldat](steamcmd_servers/soldat)
 * [Space Engineers](steamcmd_servers/space_engineers)
 * [Squad](steamcmd_servers/squad)
@@ -131,30 +152,28 @@
 * [Stormworks: Build and Rescue](steamcmd_servers/stormworks)
 * [Subnautica: Nitrox Mod](steamcmd_servers/subnautica_nitrox_mod)
 * [Sven Co-op](steamcmd_servers/svencoop)
-* [The Forest](steamcmd_servers/the_forest)
 * [Team Fortress 2 Classic](steamcmd_servers/team_fortress_2_classic)
+* [The Forest](steamcmd_servers/the_forest)
+* [Tower Unite](steamcmd_servers/tower_unite)
 * [Unturned](steamcmd_servers/unturned)
 * [Valheim](steamcmd_servers/valheim)
-  * [Valheim Vanilla](steamcmd_servers/valheim/valheim_vanilla)
   * [Valheim Plus Mod](steamcmd_servers/valheim/valheim_plus)
+  * [Valheim Vanilla](steamcmd_servers/valheim/valheim_vanilla)
 
 [Teeworlds](teeworlds)
-* [Teeworlds](teeworlds/teeworlds)
 
 [Terraria](terraria)
-* [Vanilla](terraria/vanilla)
+
 * [tModLoader](terraria/tmodloader)
 * [TShock](terraria/tshock)
+* [Vanilla](terraria/vanilla)
 
 [Tycoon Games](tycoon_games)
+* [OpenRCT2](tycoon_games/openrct2)
 * [OpenTTD](tycoon_games/openttd)
 
-[Unreal Engine](unreal_engine)
-* [Tower Unite](unreal_engine/tower_unite)
-* [Tower Unite](steamcmd_servers/tower_unite)
+[Veloren](veloren)
 
-[Veloren](veloren/veloren)
-
-[Vintage Story](vintage_story/vintage_story)
+[Vintage Story](vintage_story)
 
 [Xonotic](xonotic/xonotic)
diff --git a/game_eggs/among_us/README.md b/game_eggs/among_us/README.md
index 42fa5f9f..a87d34a4 100644
--- a/game_eggs/among_us/README.md
+++ b/game_eggs/among_us/README.md
@@ -1,7 +1,7 @@
 # Among Us
 
-[CrewLink Server](crewlink_server) 
+[CrewLink Server](crewlink_server)
 This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required.
 
-[Impostor Server](impostor_server) 
-Impostor is one of the first Among Us private servers, written in C#.
\ No newline at end of file
+[Impostor Server](impostor_server)
+Impostor is one of the first Among Us private servers, written in C#.
diff --git a/game_eggs/among_us/crewlink_server/README.md b/game_eggs/among_us/crewlink_server/README.md
index 871ce5d9..14264cfd 100644
--- a/game_eggs/among_us/crewlink_server/README.md
+++ b/game_eggs/among_us/crewlink_server/README.md
@@ -1,7 +1,15 @@
 # Among Us - CrewLink Server
-### From their [Github](https://github.com/ottomated/CrewLink)
+
+## From their [Github](https://github.com/ottomated/CrewLink)
 
 This project implements proximity voice chat in Among Us. Everyone in an Among Us lobby with this program running will be able to communicate over voice in-game, with no third-party programs required. Spatial audio ensures that you can only hear people close to you.
 
-### Server Port
-Default port is 9736 but you can change to any port or domain/ip in the egg
\ No newline at end of file
+## Server Port
+
+Ports required to run the server in a table format.
+
+| Port    | default |
+|---------|---------|
+| Game    | 9736    |
+
+Default port is 9736 but you can change to any port or domain/ip in the egg
diff --git a/game_eggs/among_us/impostor_server/README.md b/game_eggs/among_us/impostor_server/README.md
index f0e9d9c0..4a0b2088 100644
--- a/game_eggs/among_us/impostor_server/README.md
+++ b/game_eggs/among_us/impostor_server/README.md
@@ -1,14 +1,16 @@
 # Among Us - Impostor Server
-### From their [Github](https://github.com/AeonLucid/Impostor)
+
+## From their [Github](https://github.com/AeonLucid/Impostor)
 
 Impostor is one of the first Among Us private servers, written in C#.
 There are no special features at this moment, the goal is aiming to be as close as possible to the real server, for now. In a later stage, making modifications to game logic by modifying GameData packets can be looked at.
 
-### Install notes
+## Install notes
 
 You MUST use Port 22023 for the Master Server. To host multiple servers, please read [Impostor Multiple Servers Documentation](https://github.com/Impostor/Impostor/blob/master/docs/Running-the-server.md#multiple-servers).
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/game_eggs/beamng/README.md b/game_eggs/beamng/README.md
index 95cceb92..80b3c68f 100644
--- a/game_eggs/beamng/README.md
+++ b/game_eggs/beamng/README.md
@@ -3,4 +3,4 @@
 BeamMP Bringing Multiplayer to BeamNG.drive! With a smooth and enjoyable experience.
 
 * [BeamMP Server](beammp)
-* [KissMP](kissmp)
\ No newline at end of file
+* [KissMP](kissmp)
diff --git a/game_eggs/beamng/beammp/README.md b/game_eggs/beamng/beammp/README.md
index b4e401bf..a2844bc3 100644
--- a/game_eggs/beamng/beammp/README.md
+++ b/game_eggs/beamng/beammp/README.md
@@ -1,7 +1,6 @@
-
 # BeamMP
 
 BeamMP Bringing Multiplayer to BeamNG.drive! With a smooth and enjoyable experience.
 
 * [BeamMP Server](game_eggs/beamng/beammp)
-* [KissMP](game_eggs/beamng/kissmp)
\ No newline at end of file
+* [KissMP](game_eggs/beamng/kissmp)
diff --git a/game_eggs/beamng/beammp/beammp.json b/game_eggs/beamng/beammp/beammp.json
index 0837acd6..83c088a5 100644
--- a/game_eggs/beamng/beammp/beammp.json
+++ b/game_eggs/beamng/beammp/beammp.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-04-17T15:17:54-04:00",
+    "exported_at": "2021-12-22T09:10:34+00:00",
     "name": "BeamMP Servers",
     "author": "noah@noahserver.online",
     "description": "This is the server for the multiplayer mod BeamMP for the game BeamNG.drive. The server is the point throug which all clients communicate. You can write lua mods for the server, detailed instructions on the BeamMP Wiki.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/BeamMP-Server",
@@ -22,19 +22,19 @@
     },
     "scripts": {
         "installation": {
-            "script": "cd \/mnt\/server\r\n\r\nrm -f BeamMP-Server\r\n\r\napt update -y\r\napt install -y curl\r\ncurl -LJO https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases\/download\/${VERSION}\/BeamMP-Server-linux\r\nmv BeamMP-Server-linux BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\necho \"# This is the BeamMP Server Configuration File v0.60\r\nDebug = false # true or false to enable debug console output\r\nPrivate = true # Private?\r\nPort = 30814 # Port to run the server on UDP and TCP\r\nCars = 1 # Max cars for every player\r\nMaxPlayers = 10 # Maximum Amount of Clients\r\nMap = \\\"\/levels\/gridmap\/info.json\\\" # Default Map\r\nName = \\\"BeamMP New Server\\\" # Server Name\r\nDesc = \\\"BeamMP Default Description\\\" # Server Description\r\nuse = \\\"Resources\\\" # Resource file name\r\nAuthKey = \\\"\\\" # Auth Key\" > Server.cfg",
-            "container": "debian:buster-slim",
+            "script": "mkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nrm -f BeamMP-Server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/BeamMP\/BeamMP-Server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    echo -e \"Using latest version\"\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i Server-linux)\r\nelse\r\n    echo -e \"Chosen version :${VERSION}. Verifying version from releases\"\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i Server-linux)\r\n    else\r\n        echo -e \"No valid versions found. Defaulting to the latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_URL} -o BeamMP-Server\"\r\ncurl -L ${DOWNLOAD_URL} -o BeamMP-Server\r\nchmod +x BeamMP-Server\r\n\r\necho \"# This is the BeamMP Server Configuration File v0.60\r\nDebug = false # true or false to enable debug console output\r\nPrivate = true # Private?\r\nPort = 30814 # Port to run the server on UDP and TCP\r\nCars = 1 # Max cars for every player\r\nMaxPlayers = 10 # Maximum Amount of Clients\r\nMap = \\\"\/levels\/gridmap\/info.json\\\" # Default Map\r\nName = \\\"BeamMP New Server\\\" # Server Name\r\nDesc = \\\"BeamMP Default Description\\\" # Server Description\r\nuse = \\\"Resources\\\" # Resource file name\r\nAuthKey = \\\"\\\" # Auth Key\" > Server.cfg",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
     "variables": [
         {
-            "name": "Version",
-            "description": "Github Server Version, to see all versions visit https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases",
+            "name": "Version to install",
+            "description": "Latest or invalid versions would default to latest. See all versions visit https:\/\/github.com\/BeamMP\/BeamMP-Server\/releases",
             "env_variable": "VERSION",
-            "default_value": "v2.0.3",
+            "default_value": "latest",
             "user_viewable": true,
-            "user_editable": false,
+            "user_editable": true,
             "rules": "required|string|max:32"
         },
         {
diff --git a/game_eggs/beamng/kissmp/README.md b/game_eggs/beamng/kissmp/README.md
index 0aaed1e9..49a9c6ad 100644
--- a/game_eggs/beamng/kissmp/README.md
+++ b/game_eggs/beamng/kissmp/README.md
@@ -1,5 +1,5 @@
 # BeamNG.drive - KISS Multiplayer
 
-### From their [Github](https://github.com/TheHellBox/KISS-multiplayer)
+## From their [Github](https://github.com/TheHellBox/KISS-multiplayer)
 
 Server settings such as the map can be changed in the `config.json` file. Port is automatically set on each boot.
diff --git a/game_eggs/beamng/kissmp/egg-kissmp.json b/game_eggs/beamng/kissmp/egg-kissmp.json
index 5fa42529..b1f82bde 100644
--- a/game_eggs/beamng/kissmp/egg-kissmp.json
+++ b/game_eggs/beamng/kissmp/egg-kissmp.json
@@ -1,18 +1,22 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2021-02-15T20:05:24+00:00",
+    "exported_at": "2021-12-22T09:08:37+00:00",
     "name": "KissMP Server",
     "author": "me@weilbyte.dev",
     "description": "Server for the KISS Multiplayer BeamNG.drive mod",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/kissmp-server",
     "config": {
         "files": "{\r\n    \"config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Server is running!\",\r\n    \"userInteraction\": []\r\n}",
+        "startup": "{\r\n    \"done\": \"Server is running!\"\r\n}",
         "logs": "{}",
         "stop": "^C"
     },
@@ -24,4 +28,4 @@
         }
     },
     "variables": []
-}
\ No newline at end of file
+}
diff --git a/game_eggs/classicube/mcgalaxy/README.md b/game_eggs/classicube/mcgalaxy/README.md
new file mode 100644
index 00000000..08717160
--- /dev/null
+++ b/game_eggs/classicube/mcgalaxy/README.md
@@ -0,0 +1,11 @@
+# Classicube MCGalaxy
+
+[MCGalaxy](https://github.com/UnknownShadow200/MCGalaxy)
+
+MCGalaxy is a fully featured and customisable ClassiCube Server Software based on MCForge/MCLawl.
+
+## Server Ports
+
+| Port    | default |
+|---------|---------|
+| Game    | 25565   |
diff --git a/game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json b/game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json
new file mode 100644
index 00000000..c6398d32
--- /dev/null
+++ b/game_eggs/classicube/mcgalaxy/egg-classi-cube--m-g-c.json
@@ -0,0 +1,59 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-08-27T01:20:58-04:00",
+    "name": "ClassiCube(MGC)",
+    "author": "panel@qoutsy.33mail.com",
+    "description": "Debian based MCGalaxy Egg.",
+    "features": null,
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete"
+    ],
+    "file_denylist": [],
+    "startup": "mono MCGalaxyCLI.exe",
+    "config": {
+        "files": "{\r\n    \"\/properties\/server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-name\": \"{{server.build.env.HOSTNAME}}\",\r\n            \"motd\": \"{{server.build.env.MOTD}}\",\r\n            \"public\": \"true\",\r\n            \"port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Finished setting up server\"\r\n}",
+        "logs": "{}",
+        "stop": "\/shutdown 3 SIGTERM Server shutting down..."
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\napt update \r\napt -y install curl jq unzip\r\n\r\nMATCH=mcgalaxy_\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n    echo -e \"using anon api call\"\r\nelse\r\n    echo -e \"user and oauth token set\"\r\n    alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/UnknownShadow200\/MCGalaxy\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/UnknownShadow200\/MCGalaxy\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"Specified install version not found. Defaulting to latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n\r\necho -e \"Downloading ClassiCube version ${VERSION}\"\r\necho -e \"Download URL is ${DOWNLOAD_URL}\"\r\ncurl -ssL -o mcgalaxy.zip ${DOWNLOAD_URL}\r\nunzip -j mcgalaxy.zip\r\nrm mcgalaxy.zip\r\nchmod +X *.dll *.exe\r\necho \"Install complete\"",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Install Version",
+            "description": "Specify the version to install from https:\/\/github.com\/UnknownShadow200\/MCGalaxy\/releases. Leave latest to install the latest version.",
+            "env_variable": "VERSION",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Server Name",
+            "description": "Specify the server name",
+            "env_variable": "HOSTNAME",
+            "default_value": "Pterodactyl Server",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:30"
+        },
+        {
+            "name": "MOTD",
+            "description": "Specify the message of the day",
+            "env_variable": "MOTD",
+            "default_value": "Welcome to the server",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/game_eggs/cod/cod4x/README.md b/game_eggs/cod/cod4x/README.md
index bbb6555e..a1b5047c 100644
--- a/game_eggs/cod/cod4x/README.md
+++ b/game_eggs/cod/cod4x/README.md
@@ -1,20 +1,22 @@
 # Call of Duty 4X
 
 ## Game files mounting
+
 The server does **not** contain the base game files, but they are necessary to use the server.
 
 While the server itself is open-source, the game files are copyrighted and you will need to own a legitimate copy of the game (Call of Duty 4: Modern Warfare)
 in order to provide the game files to the server.
 
-More information here: https://github.com/callofduty4x/CoD4x_Server#setting-up-a-call-of-duty-4-server-with-cod4x-18
+More information here: <https://github.com/callofduty4x/CoD4x_Server#setting-up-a-call-of-duty-4-server-with-cod4x-18>
+
+## Correctly mounting the game files
 
-### Correctly mounting the game files
 In order to give the server access to the needed game files you will need to create a new mount.
 
 Let's say you copied the game files to your node into the directory `/home/pterodactyl/serverfiles/cod4x` (you can choose any directory you want of course).  
 The directory structure will look like this: <details>
- 
-```
+
+```md
 /home/pterodactyl/serverfiles/cod4x
 ├── main
 │   ├── iw_00.iwd
@@ -115,16 +117,20 @@ The directory structure will look like this: <details>
 
 3 directories, 93 files
 ```
+
 </details>
 
 First of all add the directory of the mount to the config.yml (in `/etc/pterodactyl`) of your node.
-```
+
+```md
 allowed_mounts:
   - /home/pterodactyl/serverfiles
 ```
+
 After you've done this, restart wings with `systemctl restart wings`.
 
 Now you simply create a mount in the Pterodactyl Panel with the following settings:
+
 1. Set the source to `/home/pterodactyl/serverfiles/cod4x`
 2. Set the target to any directory you want (but not something in `/home/container`, I suggest something like `/mnt/gamefiles/cod4`)
 3. Set read-only to "true" ("false" will also work, but then you risk that one instance overwrites files for all other instances)
@@ -134,21 +140,23 @@ Now you simply create a mount in the Pterodactyl Panel with the following settin
 7. Add the CoD4X egg to the list of eggs for the mount
 
 ### Correctly configuring the servers
-In order for the server to find the game files you have to set "Game file path" variable in the server to the same directory that you used in the "target" field of the mount.  
+
+In order for the server to find the game files you have to set "Game file path" variable in the server to the same directory that you used in the "target" field of the mount.
 When you start the server for the first time it will prompt you to mount the game files under the configured path.
+
 1. In the admin interface open your server
 2. Go to the tab "Mounts"
 3. Klick on the green "+" button on the correct mount in order to mount the game files
 4. Restart the server
 
-
 **Congratulations!** Your server should be able to find the game files and start.
 
 ## Default Server Ports
+
 The default is 28960, but the server will automatically use the port defined in the allocation.
 
 | Port    | default |
 |---------|---------|
 | Game    | 28960   |
 
-#### Plugins may require ports to be added to the server.
+### Plugins may require ports to be added to the server
diff --git a/game_eggs/cryofall/cryofall/egg-cryo-fall.json b/game_eggs/cryofall/cryofall/egg-cryo-fall.json
deleted file mode 100644
index 8a912438..00000000
--- a/game_eggs/cryofall/cryofall/egg-cryo-fall.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
-    "meta": {
-        "version": "PTDL_v1",
-        "update_url": null
-    },
-    "exported_at": "2021-01-22T16:39:06+01:00",
-    "name": "CryoFall",
-    "author": "contact@zennodes.dk",
-    "description": "NOTE: For now you have to change SettingsServer.xml under CryoFall_Server_v(Version)_NetCore\/Data\/SettingsServer.xml\r\n\r\nCryoFall is a sci-fi multiplayer colony simulation survival game set on a forgotten planet in a distant future.\r\n\r\nJoin the vast world of CryoFall together with other survivors to rebuild your civilization from scratch. Start with primitive technology and simple tools and use them to progress towards modern industrial might and even beyond, eventually reaching space-age technology only seen in science fiction.\r\n\r\nCryoFall can be played either as a relaxed PvE experience with no competition or as a brutal and unforgiving PvP. Make your choice and join one of many available servers with different game modes or host your own and invite your friends to join you!\r\n\r\nBuild your house or a large base together with other players. Dig wells and create farms to sustain basic needs. Build vehicles to explore the world faster. Establish basics of science, all the way from medicine and chemistry to fuel creation and even lithium extraction to create electronic devices. Cook food or prepare drinks to sell them from vending machines in your store.\r\n\r\nBuild factories to produce on an industrial scale: Weapons and defense systems, bionic implants to augment yourself, even large war machines and artillery guns to use against the biggest of opponents",
-    "features": null,
-    "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5"
-    ],
-    "file_denylist": "",
-    "startup": "dotnet Binaries\/Server\/CryoFall_Server.dll loadOrNew",
-    "config": {
-        "files": "{}",
-        "startup": "{\r\n    \"done\": \"[IMP] UDPServer: Socket-server listening on \"\r\n}",
-        "logs": "{}",
-        "stop": "stop 10 stopping server"
-    },
-    "scripts": {
-        "installation": {
-            "script": "#!\/bin\/bash\r\n#Server Files: \/mnt\/server\r\napt update\r\napt install -y curl zip unzip\r\n\r\nif [[ ! -d \/mnt\/server\/ ]]; then\r\n    mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ \"${VERSION}\" == \"latest\" ] || [ \"${VERSION}\" == \"\" ]; then\r\n    DOWNLOAD_URL=$(curl -sSL https:\/\/wiki.atomictorch.com\/CryoFall\/Server\/Setup | grep 'SERVER DOWNLOAD' | grep -Eoi '<a [^>]+>' | grep -Eo 'href=\\\"[^\\\\\\\"]+\\\"' | grep -Eo '(http|https):\\\/\\\/[^\\\"]+' | tail -1 | cut -d'?' -f1)\r\nelse\r\n    DOWNLOAD_URL=https:\/\/atomictorch.com\/Files\/CryoFall_Server_v${VERSION}_NetCore.zip\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -L -o cryofall_server.zip ${DOWNLOAD_LINK}\r\n\r\nunzip cryofall_server.zip\r\n\r\ncp -rf CryoFall_Server*NetCore\/. \/mnt\/server\r\n\r\nrm -rf cryofall_server.zip CryoFall_Server*NetCore\/",
-            "container": "debian:buster-slim",
-            "entrypoint": "bash"
-        }
-    },
-    "variables": [
-        {
-            "name": "Game server version",
-            "description": "type game server version",
-            "env_variable": "VERSION",
-            "default_value": "latest",
-            "user_viewable": true,
-            "user_editable": true,
-            "rules": "required|string|max:20"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/game_eggs/enemy_territory/etlegacy/README.md b/game_eggs/enemy_territory/etlegacy/README.md
index 43b83406..09555dd7 100644
--- a/game_eggs/enemy_territory/etlegacy/README.md
+++ b/game_eggs/enemy_territory/etlegacy/README.md
@@ -1,20 +1,20 @@
 # ET: Legacy
 
-#### The ET: Legacy Server
+## The ET: Legacy Server
 
-
-#### from the developers
+## from the developers
 
 Wolfenstein: Enemy Territory is a free multiplayer first-person shooter. Set during World War II and heavily focused on team work, it was initially released in 2003 by Splash Damage and id Software. More than a decade after its release, after spending countless hours of escorting tanks and trucks, stealing gold and radar parts
 and transmitting confidential documents, it was time to dust off the game which consistently refused to go down.
 
-Enemy Territory: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of GPLv3 license. The main goal of this project is to fix bugs, remove old dependencies and make it playable on all major operating systems while still remaining compatible with the ET 2.60b version and as many of its mods as possible. We do appreciate any contribution to the project such as patches, suggestions or comments. 
+Enemy Territory: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of GPLv3 license. The main goal of this project is to fix bugs, remove old dependencies and make it playable on all major operating systems while still remaining compatible with the ET 2.60b version and as many of its mods as possible. We do appreciate any contribution to the project such as patches, suggestions or comments.
 
 Make sure to checkout their [Home Page](https://www.etlegacy.com/).
 
-### Server Ports
-ET: Legacy requires a single port  
+## Server Ports
+
+ET: Legacy requires a single port
 
 | Port    | default |
 |---------|---------|
-| Game    | 27960   |
\ No newline at end of file
+| Game    | 27960   |
diff --git a/game_eggs/factorio/README.md b/game_eggs/factorio/README.md
index 714d66d2..5095e4a6 100644
--- a/game_eggs/factorio/README.md
+++ b/game_eggs/factorio/README.md
@@ -1,12 +1,13 @@
 # Factorio
 
-#### The Factorio Server
-The server supports mods. 
-The factorio-modupdate egg uses the factorio-mod-updater (https://github.com/pdemonaco/factorio-mod-updater) to update your mods when ReInstalling the Server.
+## The Factorio Server
 
-#### from the developers
+The server supports mods.
+The factorio-modupdate egg uses the [factorio-mod-updater](https://github.com/pdemonaco/factorio-mod-updater) to update your mods when ReInstalling the Server.
 
-Factorio is a game in which you build and maintain factories.  
+## from the developers
+
+Factorio is a game in which you build and maintain factories.
 
 You will be mining resources, researching technologies, building infrastructure, automating production and fighting enemies. Use your imagination to design your factory, combine simple elements into ingenious structures, apply management skills to keep it working, and protect it from the creatures who don't really like you.
 
@@ -16,9 +17,10 @@ Factorio has been in development since the spring of 2012. So far over 1,400,000
 
 New to the game? Make sure to checkout their [starter page](https://factorio.com/starter-page).
 
-### Server Ports
-Factorio requires a single port  
+## Server Ports
+
+Factorio requires a single port
 
 | Port    | default |
 |---------|---------|
-| Game    | 34197   |
\ No newline at end of file
+| Game    | 34197   |
diff --git a/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json b/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json
index ea6f7d1a..12d63f3e 100644
--- a/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json
+++ b/game_eggs/factorio/factorio-modupdate/egg-factorio-modupdate.json
@@ -4,19 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-01-15T16:32:57+01:00",
+    "exported_at": "2022-01-22T05:41:57-05:00",
     "name": "Factorio-ModUpdate",
     "author": "tueye@tuworld.de",
     "description": "The vanilla Factorio server. With automatic Mod Updates after ReInstall.\r\n\r\nhttps:\/\/www.factorio.com\/",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
+    "file_denylist": [],
     "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server {{SAVE_NAME}}.zip",
     "config": {
         "files": "{\r\n    \"data\/server-settings.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"description\": \"{{server.build.env.SERVER_DESC}}\",\r\n            \"max_players\": \"{{server.build.env.MAX_SLOTS}}\",\r\n            \"username\": \"{{server.build.env.SERVER_USERNAME}}\",\r\n            \"token\": \"{{server.build.env.SERVER_TOKEN}}\",\r\n            \"autosave_interval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n            \"autosave_slots\": \"{{server.build.env.SAVE_SLOTS}}\",\r\n            \"afk_autokick_interval\": \"{{server.build.env.AFK_KICK}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Hosting game at\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"factorio-current.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Hosting game at\"\r\n}",
+        "logs": "{}",
         "stop": "\/quit"
     },
     "scripts": {
@@ -118,4 +119,4 @@
             "rules": "required|numeric|digits_between:1,3"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/factorio/factorio/egg-factorio.json b/game_eggs/factorio/factorio/egg-factorio.json
index a3462ccc..7f29aaf2 100644
--- a/game_eggs/factorio/factorio/egg-factorio.json
+++ b/game_eggs/factorio/factorio/egg-factorio.json
@@ -1,24 +1,29 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-06-26T12:55:32-04:00",
+    "exported_at": "2022-01-02T22:43:37-05:00",
     "name": "Factorio",
     "author": "parker@parkervcp.com",
     "description": "The vanilla Factorio server.\r\n\r\nhttps:\/\/www.factorio.com\/",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
-    "startup": ".\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server {{SAVE_NAME}}.zip",
+    "features": null,
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
+    "startup": "if [ ! -f \".\/saves\/{{SAVE_NAME}}.zip\" ]; then .\/bin\/x64\/factorio --create .\/saves\/{{SAVE_NAME}}.zip --map-gen-settings data\/map-gen-settings.json --map-settings data\/map-settings.json; fi;\r\n .\/bin\/x64\/factorio --port {{SERVER_PORT}} --server-settings data\/server-settings.json --start-server saves\/{{SAVE_NAME}}.zip",
     "config": {
         "files": "{\r\n    \"data\/server-settings.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"name\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"description\": \"{{server.build.env.SERVER_DESC}}\",\r\n            \"max_players\": \"{{server.build.env.MAX_SLOTS}}\",\r\n            \"username\": \"{{server.build.env.SERVER_USERNAME}}\",\r\n            \"token\": \"{{server.build.env.SERVER_TOKEN}}\",\r\n            \"autosave_interval\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n            \"autosave_slots\": \"{{server.build.env.SAVE_SLOTS}}\",\r\n            \"afk_autokick_interval\": \"{{server.build.env.AFK_KICK}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Hosting game at\",\r\n    \"userInteraction\": []\r\n}",
+        "startup": "{\r\n    \"done\": \"Hosting game at\"\r\n}",
         "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"factorio-current.log\"\r\n}",
         "stop": "\/quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update \r\napt install -y curl tar xz-utils jq\r\n\r\nVERSION_JSON=$(curl -sSL https:\/\/factorio.com\/api\/latest-releases)\r\n\r\nlatest_stable=$(echo $VERSION_JSON | jq -r '.stable.headless')\r\nlatest_experimental=$(echo $VERSION_JSON | jq -r '.experimental.headless')\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n  DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n  DL_VERSION=$latest_experimental\r\nelse\r\n  DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}' \\n\"\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}\r\n\r\ntar -xf factorio-${DL_VERSION} --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n    echo \"map-gen exists\"\r\nelse\r\n    echo \"copying map-gen default settings\"\r\n    mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n    echo \"server settings exists\"\r\nelse\r\n    echo \"copying server default settings\"\r\n    mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n    echo \"map settings exists\"\r\nelse\r\n    echo \"copying map default settings\"\r\n    mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e ${SAVE_NAME}.zip ]; then\r\n    echo \"save file exists\"\r\nelse\r\n    .\/bin\/x64\/factorio --create ${SAVE_NAME}\r\n    chmod o+w ${SAVE_NAME}.zip\r\nfi",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# Factorio Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update \r\napt install -y curl tar xz-utils jq\r\n\r\nVERSION_JSON=$(curl -sSL https:\/\/factorio.com\/api\/latest-releases)\r\n\r\nlatest_stable=$(echo $VERSION_JSON | jq -r '.stable.headless')\r\nlatest_experimental=$(echo $VERSION_JSON | jq -r '.experimental.headless')\r\n\r\nif [ -z \"${FACTORIO_VERSION}\" ] || [ \"${FACTORIO_VERSION}\" == \"latest\" ]; then\r\n  DL_VERSION=$latest_stable\r\nelif [ \"${FACTORIO_VERSION}\" == \"experimental\" ]; then\r\n  DL_VERSION=$latest_experimental\r\nelse\r\n  DL_VERSION=${FACTORIO_VERSION}\r\nfi\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\necho -e \"\\n running 'curl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}' \\n\"\r\n\r\ncurl -sL https:\/\/www.factorio.com\/get-download\/${DL_VERSION}\/headless\/linux64 -o factorio-${DL_VERSION}\r\n\r\ntar -xf factorio-${DL_VERSION} --strip-components=1 -C \/mnt\/server\r\n\r\nrm factorio-${DL_VERSION}\r\n\r\nif [ -e data\/map-gen-settings.json ]; then\r\n    echo \"map-gen exists\"\r\nelse\r\n    echo \"copying map-gen default settings\"\r\n    mv data\/map-gen-settings.example.json data\/map-gen-settings.json\r\nfi\r\n\r\nif [ -e data\/server-settings.json ]; then\r\n    echo \"server settings exists\"\r\nelse\r\n    echo \"copying server default settings\"\r\n    mv data\/server-settings.example.json data\/server-settings.json\r\nfi\r\n\r\nif [ -e map-settings.json ]; then\r\n    echo \"map settings exists\"\r\nelse\r\n    echo \"copying map default settings\"\r\n    mv data\/map-settings.example.json data\/map-settings.json\r\nfi\r\n\r\nif [ -e .\/saves\/${SAVE_NAME}.zip ]; then\r\n    echo \"save file exists\"\r\nelse\r\n    .\/bin\/x64\/factorio --create .\/saves\/${SAVE_NAME} --map-gen-settings data\/map-gen-settings.json --map-settings data\/map-settings.json\r\n    chmod o+w .\/saves\/${SAVE_NAME}.zip\r\nfi",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -28,8 +33,8 @@
             "description": "Which version of Factorio to install and use.",
             "env_variable": "FACTORIO_VERSION",
             "default_value": "latest",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|between:3,12"
         },
         {
@@ -37,8 +42,8 @@
             "description": "Total number of slots to allow on the server.",
             "env_variable": "MAX_SLOTS",
             "default_value": "20",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|numeric|digits_between:1,3"
         },
         {
@@ -46,8 +51,8 @@
             "description": "The save name for the server.",
             "env_variable": "SAVE_NAME",
             "default_value": "gamesave",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "alpha_dash|between:1,100"
         },
         {
@@ -55,8 +60,8 @@
             "description": "Your factorio.com token, it is required for your server to be visible in the public server list.",
             "env_variable": "SERVER_TOKEN",
             "default_value": "undefined",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "alpha_num|max:100"
         },
         {
@@ -64,8 +69,8 @@
             "description": "Name of the game as it will appear in the game listing",
             "env_variable": "SERVER_NAME",
             "default_value": "Factorio Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:100"
         },
         {
@@ -73,8 +78,8 @@
             "description": "Description of the game that will appear in the listing.",
             "env_variable": "SERVER_DESC",
             "default_value": "Description",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:200"
         },
         {
@@ -82,8 +87,8 @@
             "description": "Username used for the server",
             "env_variable": "SERVER_USERNAME",
             "default_value": "unnamed",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:40"
         },
         {
@@ -91,8 +96,8 @@
             "description": "Time between auto saves specified in minutes",
             "env_variable": "SAVE_INTERVAL",
             "default_value": "10",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric|digits_between:1,3"
         },
         {
@@ -100,8 +105,8 @@
             "description": "The number of auto saves to keep.",
             "env_variable": "SAVE_SLOTS",
             "default_value": "5",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric|digits_between:1,3"
         },
         {
@@ -109,8 +114,8 @@
             "description": "Time specified in minutes to kick AFK players.\r\n0 is off",
             "env_variable": "AFK_KICK",
             "default_value": "0",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric|digits_between:1,3"
         }
     ]
diff --git a/game_eggs/ftl/tachyon/README.MD b/game_eggs/ftl/tachyon/README.MD
index c4c03499..cfccac50 100644
--- a/game_eggs/ftl/tachyon/README.MD
+++ b/game_eggs/ftl/tachyon/README.MD
@@ -12,4 +12,4 @@ The Tachyon server requires a single port for access.
 
 ## Server Specific
 
-Latest client and standalone server can be found at https://github.com/Dav-Edward/TachyonsCE/releases
+Latest client and standalone server can be found at <https://github.com/Dav-Edward/TachyonsCE/releases>
diff --git a/game_eggs/gta/README.md b/game_eggs/gta/README.md
index 2847f0a3..d79f00a7 100644
--- a/game_eggs/gta/README.md
+++ b/game_eggs/gta/README.md
@@ -1,11 +1,11 @@
-# Grand Theft Auto  
+# Grand Theft Auto
 
 ## GTA V
 
-[FiveM](https://fivem.net/)  
-FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers. 
+[FiveM](https://fivem.net/)
+FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers.
 
-[Rage MP](https://rage.mp/)  
+[Rage MP](https://rage.mp/)
 RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is alternative to GTA Online.
 
 [alt:V](https://altv.mp)
@@ -13,10 +13,10 @@ alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V
 
 ## San Andreas
 
-[GTA SA:MP](https://www.sa-mp.com/)  
-SA-MP is a free Massively Multiplayer Online game mod for the PC version of Rockstar Games Grand Theft Auto: San Andreas (tm). 
+[GTA SA:MP](https://www.sa-mp.com/)
+SA-MP is a free Massively Multiplayer Online game mod for the PC version of Rockstar Games Grand Theft Auto: San Andreas (tm).
 
-[MTA SA](https://mtasa.com/)  
+[MTA SA](https://mtasa.com/)
 What more could you want? Multi Theft Auto provides the best online Grand Theft Auto experience there is. Read on to find out more.
 
 ## GTAC
diff --git a/game_eggs/gta/altv/README.md b/game_eggs/gta/altv/README.md
index dddd7a36..25850aeb 100644
--- a/game_eggs/gta/altv/README.md
+++ b/game_eggs/gta/altv/README.md
@@ -1,9 +1,11 @@
 # alt:v
 
-### From the [alt:V](https://altv.mp) Site
+## From the [alt:V](https://altv.mp) Site
+
 alt:V Multiplayer a third-party multiplayer modification for Grand Theft Auto: V.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/game_eggs/gta/altv/egg-alt--v.json b/game_eggs/gta/altv/egg-alt--v.json
index cd2acfca..5052a307 100644
--- a/game_eggs/gta/altv/egg-alt--v.json
+++ b/game_eggs/gta/altv/egg-alt--v.json
@@ -18,7 +18,7 @@
         "files": "{\r\n    \"server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"host:\": \"host: 0.0.0.0\",\r\n            \"port:\": \"port: {{server.build.default.port}}\",\r\n            \"password:\": \"password: {{server.build.env.PASSWORD}}\",\r\n            \"description:\": \"description: {{server.build.env.SERVER_DESC}}\"\r\n        }\r\n    },\r\n    \"update.cfg\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"branch\": \"{{server.build.env.BUILD}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Server started\"\r\n}",
         "logs": "{}",
-        "stop": "^C"
+        "stop": "quit"
     },
     "scripts": {
         "installation": {
diff --git a/game_eggs/gta/fivem/README.md b/game_eggs/gta/fivem/README.md
index 25c312f2..12f44451 100644
--- a/game_eggs/gta/fivem/README.md
+++ b/game_eggs/gta/fivem/README.md
@@ -1,24 +1,37 @@
-# FiveM 
+# FiveM
+
+## Note on FiveM support from Pteroadactyl
+
+Pterodactyl will not be providing support for FiveM. You are free to run a FiveM server but no support will be provided in the Pterodactyl Discord, check the discord annoucement below for details.
+
+Worth a read if you plan on running a FiveM server
+[Pterodactyl Discord Announcement](https://ptb.discord.com/channels/122900397965705216/124919575534895105/869733533495746560)
+
 ## From the [FiveM](https://fivem.net/) Site
+
 FiveM is a modification for Grand Theft Auto V enabling you to play multiplayer on customized dedicated servers.
 
-# Notice
+## Notice
+
 Currently the script can get versions from the builds site.
 
 The `FIVEM_VERSION` variable.
+
 * Defaults to `latest` which is the latest recommended
 * Can be set to a specific version Ex. `2431-350dd7bd5c0176216c38625ad5b1108ead44674d`.
 
 The `DOWNLOAD_URL` only needs to be used if they turn on ddos protection. The variable needs to point to a `fx.tar.xz` file as I am too lazy to update the entire script.
 
-# txAdmin
+## txAdmin
+
 txAdmin is now supported and disabled by default. You set `TXADMIN_ENABLED` to `1` to enable it.
 
 The last update to the egg changes the server to use txadmin to run. On first startup it will print a key to use to sign into the txadmin panel.
 
-### Your server will not go online until it's started from txadmin.
+### Your server will not go online until it's started from txadmin
 
 ## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/game_eggs/gta/fivem/egg-five-m.json b/game_eggs/gta/fivem/egg-five-m.json
index 9f7614c3..142588eb 100644
--- a/game_eggs/gta/fivem/egg-five-m.json
+++ b/game_eggs/gta/fivem/egg-five-m.json
@@ -4,7 +4,7 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T03:50:53+03:00",
+    "exported_at": "2022-01-11T10:14:56-05:00",
     "name": "FiveM",
     "author": "parker@parkervcp.com",
     "description": "A new FiveM egg for the latest builds due to recent changes in FiveM",
@@ -18,11 +18,11 @@
         "files": "{\r\n    \"server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"endpoint_add_tcp\": \"endpoint_add_tcp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n            \"endpoint_add_udp\": \"endpoint_add_udp \\\"0.0.0.0:{{server.build.default.port}}\\\"\",\r\n            \"sv_hostname\": \"sv_hostname \\\"{{server.build.env.SERVER_HOSTNAME}}\\\"\",\r\n            \"set sv_licenseKey\": \"set sv_licenseKey {{server.build.env.FIVEM_LICENSE}}\",\r\n            \"set steam_webApiKey\": \"set steam_webApiKey {{server.build.env.STEAM_WEBAPIKEY}}\",\r\n            \"sv_maxclients\": \"sv_maxclients {{server.build.env.MAX_PLAYERS}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"succeeded. Welcome!\"\r\n}",
         "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
+        "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\n\r\nif [ \"${FIVEM_VERSION}\" == \"latest\" ] || [ -z ${FIVEM_VERSION} ] ; then\r\n    LATEST_RECOMMENDED=$(echo -e \"${RELEASE_PAGE}\" | grep \"LATEST RECOMMENDED\" -B1 | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep -P '\\d{4}-\\S{40}\\\/fx\\.tar\\.xz')\r\n    DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${LATEST_RECOMMENDED})\r\nelse\r\n    VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo 'href=\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${FIVEM_VERSION})\r\n    if [ \"${VERSION_LINK}\" == \"\" ]; then\r\n        echo -e \"defaulting to latest as the version requested was invalid.\"\r\n    else\r\n        DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n    fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n    tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n    unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n    tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n    echo -e \"unknown filetype. Exiting\"\r\n    exit 2 \r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default fivem config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\nmkdir logs\/\r\n\r\necho \"install complete\"",
+            "script": "#!\/bin\/ash\r\n# FiveM Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update -y\r\napt install -y tar xz-utils curl git file jq\r\n\r\nmkdir -p \/mnt\/server\/resources\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${FIVEM_VERSION}\" == \"latest\" ]] || [[ -z ${FIVEM_VERSION} ]]; then\r\n  DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n  VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n  if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n    echo -e \"defaulting to latest as the version requested was invalid.\"\r\n    DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\n  else\r\n    DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n  fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n  if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n    echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n    DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n  else\r\n    echo -e \"link is invalid closing out\"\r\n    exit 2\r\n  fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n  tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n  unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n  tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n  echo -e \"unknown filetype. Exiting\"\r\n  exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n  echo \"Skipping downloading default server config file as one already exists\"\r\nelse\r\n  echo \"Downloading default fivem config\"\r\n  curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\nmkdir -p logs\/\r\n\r\necho \"install complete\"",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -57,7 +57,7 @@
         },
         {
             "name": "fivem version",
-            "description": "The fivem version that is to be installed.\r\n\r\nan example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can get the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/",
+            "description": "The fivem version that is to be installed. Invalid versions will default to latest.\r\n\r\nAn example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can get the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/",
             "env_variable": "FIVEM_VERSION",
             "default_value": "latest",
             "user_viewable": true,
@@ -98,7 +98,7 @@
             "default_value": "0",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         }
     ]
 }
diff --git a/game_eggs/gta/gtac/README.md b/game_eggs/gta/gtac/README.md
index fe3be939..b32b1f37 100644
--- a/game_eggs/gta/gtac/README.md
+++ b/game_eggs/gta/gtac/README.md
@@ -1,10 +1,11 @@
 # Grand Theft Auto Connected
+
 The [GTAC](https://gtaconnected.com/) Grand Theft Auto Connected is a custom scriptable multiplayer modification for multiple Grand Theft Auto games.
 
-### Server Ports
+## Server Ports
 
 GTAC requires one port for both UDP/TCP
 
 | Port    | default  |
 |---------|----------|
-| Game    | 22000    |
\ No newline at end of file
+| Game    | 22000    |
diff --git a/game_eggs/gta/mtasa/README.md b/game_eggs/gta/mtasa/README.md
index ed5c0ff2..171b0eae 100644
--- a/game_eggs/gta/mtasa/README.md
+++ b/game_eggs/gta/mtasa/README.md
@@ -1,7 +1,8 @@
 # Multi Theft Auto
+
 [Multi Theft Auto](https://mtasa.com/) is a Open Source Grand Theft Auto: San Andreas Multiplayer modification.
 
-### Server Ports
+## Server Ports
 
 Multi Theft Auto requires 3 ports.
 
diff --git a/game_eggs/gta/ragemp/README.MD b/game_eggs/gta/ragemp/README.MD
index b35e9c35..62b9c3e2 100644
--- a/game_eggs/gta/ragemp/README.MD
+++ b/game_eggs/gta/ragemp/README.MD
@@ -1,12 +1,13 @@
 # Rage-MP
-The [Rage-MP](https://rage.mp/) GTA 5 dedicated server  
+
+The [Rage-MP](https://rage.mp/) GTA 5 dedicated server
 RAGE Multiplayer is an multiplayer modification for Grand Theft Auto V that is alternative to GTA Online.
 
-### Server Ports
+## Server Ports
 
 Warband requires a 2 ports (default 22005, 22006)
 
 | Port    | default  |
 |---------|----------|
 | Game    | 22005    |
-| http    | 22006    |
\ No newline at end of file
+| http    | 22006    |
diff --git a/game_eggs/gta/samp/README.md b/game_eggs/gta/samp/README.md
index d4fcf00c..dff71cfd 100644
--- a/game_eggs/gta/samp/README.md
+++ b/game_eggs/gta/samp/README.md
@@ -1,2 +1,3 @@
 # SA:MP
-The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server
\ No newline at end of file
+
+The [SA:MP](https://www.sa-mp.com/) GTA San Andreas dedicated server
diff --git a/game_eggs/leaguesandbox/leaguesandbox/LeagueSandbox_Egg.json b/game_eggs/leaguesandbox/LeagueSandbox_Egg.json
similarity index 100%
rename from game_eggs/leaguesandbox/leaguesandbox/LeagueSandbox_Egg.json
rename to game_eggs/leaguesandbox/LeagueSandbox_Egg.json
diff --git a/game_eggs/leaguesandbox/leaguesandbox/README.md b/game_eggs/leaguesandbox/README.md
similarity index 70%
rename from game_eggs/leaguesandbox/leaguesandbox/README.md
rename to game_eggs/leaguesandbox/README.md
index e5022466..136badf3 100644
--- a/game_eggs/leaguesandbox/leaguesandbox/README.md
+++ b/game_eggs/leaguesandbox/README.md
@@ -1,19 +1,25 @@
 # League Sandbox
-### From their [Github](https://github.com/parkervcp/eggs)
+
+## From their [Github](https://github.com/LeagueSandbox/leaguesandbox.github.io)
+
 [![Build status](https://ci.appveyor.com/api/projects/status/7olahkndcs3r295p/branch/indev?svg=true)](https://ci.appveyor.com/project/MythicManiac/gameserver/branch/indev)
 [![Build Status](https://travis-ci.org/LeagueSandbox/GameServer.svg?branch=indev)](https://travis-ci.org/LeagueSandbox/GameServer)
 
-Project website along with more specifications can be found from: https://leaguesandbox.github.io/
-Project chat on Discord: https://discord.gg/Bz3znAM 
+Project website along with more specifications can be found from: <https://leaguesandbox.github.io/>
+
+Project chat on Discord: <https://discord.gg/Bz3znAM>
+
+## Install notes
+
+Post install you are required to set
 
-### Install notes
-Post install you are required to set 
 - `/home/container/Settings/GameInfo.json` `CONTENT_PATH` to just `Content`
 - `/home/container/Settings/GameServerSettings.json` `autoStartClient` to `false`
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port | default |
 | ---- | ------- |
-| Game | 5119    |
\ No newline at end of file
+| Game | 5119    |
diff --git a/game_eggs/mindustry/mindustry/README.md b/game_eggs/mindustry/README.md
similarity index 87%
rename from game_eggs/mindustry/mindustry/README.md
rename to game_eggs/mindustry/README.md
index b47636ed..0521f66a 100644
--- a/game_eggs/mindustry/mindustry/README.md
+++ b/game_eggs/mindustry/README.md
@@ -1,15 +1,14 @@
 # Mindustry
 
-#### About the game
+## About the game
 
 Mindustry is a hybrid tower-defense sandbox factory game. Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies. Features include a map editor, 24 built-in maps, cross-platform multiplayer and large-scale PvP unit battles.
 
-
 You can get it from [Steam](https://store.steampowered.com/app/1127400)
 
+## Server Port
 
-### Server Port
-Mindustry requires a single port  
+Mindustry requires a single port
 
 | Port    | Default |
 |---------|---------|
diff --git a/game_eggs/mindustry/mindustry/egg-mindustry.json b/game_eggs/mindustry/egg-mindustry.json
similarity index 98%
rename from game_eggs/mindustry/mindustry/egg-mindustry.json
rename to game_eggs/mindustry/egg-mindustry.json
index 1b7393d1..00e44bea 100644
--- a/game_eggs/mindustry/mindustry/egg-mindustry.json
+++ b/game_eggs/mindustry/egg-mindustry.json
@@ -7,7 +7,7 @@
     "name": "Mindustry",
     "author": "unknown@unknown.com",
     "description": "Mindustry is a hybrid tower-defense sandbox factory game. Create elaborate supply chains of conveyor belts to feed ammo into your turrets, produce materials to use for building, and defend your structures from waves of enemies.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-11",
+    "image": "ghcr.io\/pterodactyl\/yolks:java_11",
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server-release.jar config port {{SERVER_PORT}},config name {{SERVER_NAME}},host {{MAPNAME}}",
     "config": {
         "files": "{}",
diff --git a/game_eggs/minecraft/README.md b/game_eggs/minecraft/README.md
index 3b27c2a6..e10d63b2 100644
--- a/game_eggs/minecraft/README.md
+++ b/game_eggs/minecraft/README.md
@@ -4,39 +4,48 @@ It’s a game about placing blocks and going on adventures
 
 It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril!
 
-[Bedrock](/game_eggs/minecraft/bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console)
-* [Bedrock](/game_eggs/game_eggs/minecraft/bedrock/bedrock)
-* [gomint](/game_eggs/minecraft/bedrock/gomint)
-* [Nukkit](/game_eggs/minecraft/bedrock/nukkit)  
-* [PocketMine MP](/game_eggs/minecraft/bedrock/pocketmine_mp)  
+## [Bedrock](bedrock) Servers for Bedrock Minecraft (Windows 10, mobile, console)
 
-[Java](/game_eggs/minecraft/java/) Servers for Java Minecraft
-* [Airplane](/game_eggs/minecraft/java/airplane)
-* [Cuberite](/game_eggs/minecraft/java/cuberite)
-* [Fabric](/game_eggs/minecraft/java/fabric) 
-* [Feather](/game_eggs/minecraft/java/feather)  
-* [Feed The Beast](/game_eggs/minecraft/java/ftb)  
-* [Forge](/game_eggs/minecraft/java/forge)  
-* [Magma](/game_eggs/minecraft/java/magma)
-* [Mohist](/game_eggs/minecraft/java/mohist)
-* [Paper](/game_eggs/minecraft/java/paper)
-* [Purpur](/game_eggs/minecraft/java/purpur)
-* [Spigot](/game_eggs/minecraft/java/spigot)
-* [SpongeForge](/game_eggs/minecraft/java/spongeforge)
-* [SpongeVanilla](/game_eggs/minecraft/java/spongevanilla)
-* [Technic](/game_eggs/minecraft/java/technic)
-* [Tuinity](/game_eggs/minecraft/java/tuinity)
-* [VanillaCord](/game_eggs/minecraft/java/vanillacord)
+* [Bedrock](bedrock/bedrock)
+* [gomint](bedrock/gomint)
+* [Nukkit](bedrock/nukkit)
+* [PocketMine MP](bedrock/pocketmine_mp)
 
-* [Proxies](/game_eggs/minecraft/proxy) Minecraft Server Proxies
-  * [Java](/game_eggs/minecraft/proxy/java)
-	* [FlameCord](/game_eggs/minecraft/proxy/java/flamecord)
-    * [Travertine](/game_eggs/minecraft/proxy/java/travertine)
-    * [TyphoonLimbo](/game_eggs/minecraft/proxy/java/typhoonlimbo)
-    * [Velocity](/game_eggs/minecraft/proxy/java/velocity)
-    * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas)
-    * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall)
-  * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform)
-    * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser)
-    * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog)
-	* DragonProxy abandoned in favour of GeyserMC.
+## [Java](java) Servers for Java Minecraft
+
+* [Airplane](minecraft/java/airplane)
+* [Cuberite](minecraft/java/cuberite)
+* [Fabric](minecraft/java/fabric)
+* [Feather](minecraft/java/feather)
+* [Forge](minecraft/java/forge)
+  * [Forge](minecraft/java/forge/forge)
+  * [CusreForge Generic](minecraft/java/forge/curseforge-generic)
+* [Feed The Beast](minecraft/java/ftb)
+* [Glowstone](/minecraft/java/glowstone)
+* [Krypton](/minecraft/java/krypton)
+* [Magma](minecraft/java/magma)
+* [Mohist](minecraft/java/mohist)
+* [NanoLimbo](/minecraft/java/nanolimbo)
+* [Paper](minecraft/java/paper)
+* [Purpur](minecraft/java/purpur)
+* [Spigot](minecraft/java/spigot)
+* [SpongeForge](minecraft/java/spongeforge)
+* [SpongeVanilla](minecraft/java/spongevanilla)
+* [Technic](minecraft/java/technic)
+* [Tuinity](minecraft/java/tuinity)
+* [VanillaCord](minecraft/java/vanillacord)
+
+## [Proxies](proxy) Minecraft Server Proxies
+
+* [Bedrock](minecraft/proxy/bedrock)
+  * [Waterdog PE](minecraft/proxy/bedrock/waterdog_pe)
+* [Cross Platform](minecraft/proxy/cross_platform)
+  * [GeyserMC](minecraft/proxy/cross_platform/geyser)
+  * [Waterdog](minecraft/proxy/cross_platform/waterdog)
+* [Java](minecraft/proxy/java)
+  * [FlameCord](minecraft/proxy/java/flamecord)
+  * [Travertine](minecraft/proxy/java/travertine)
+  * [TyphoonLimbo](minecraft/proxy/java/typhoonlimbo)
+  * [Velocity](minecraft/proxy/java/velocity)
+  * [VIAaas](minecraft/proxy/java/viaaas)
+  * [Waterfall](minecraft/proxy/java/waterfall)
\ No newline at end of file
diff --git a/game_eggs/minecraft/bedrock/README.md b/game_eggs/minecraft/bedrock/README.md
index 7c5df3df..888a88cc 100644
--- a/game_eggs/minecraft/bedrock/README.md
+++ b/game_eggs/minecraft/bedrock/README.md
@@ -1,17 +1,22 @@
-# Minecraft PE (bedrock edition)
+# Minecraft Bedrock (Formerly Pocket Edition)
+
+## [Bedrock](/game_eggs/minecraft/bedrock/bedrock)
 
-#### Bedrock
 [Minecraft Bedrock Server](https://minecraft.net/en-us/download/server/bedrock/)
 The official Minecraft Bedrock (Formerly Minecraft Pocket Edition) server.
 
-#### gomint
+## [gomint](/game_eggs/minecraft/bedrock/gomint)
+
 [Gomint Bedrock Server](https://github.com/gomint/gomint)
-Easy-to-use, highly configurable Minecraft Bedrock Edition
 server software with the ability to sustain in a low-resource environment.
+No longer actively maintained.
+GoMint is a modern Minecraft Bedrock Edition server enabling you to make your visions come true
 
-#### Nukkit
-[Nukkit GitHub](https://github.com/Nukkit/Nukkit)  
-Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition  
+## [Nukkit](/game_eggs/minecraft/bedrock/nukkit)
 
-#### PocketMine MP
-[PocketMine MP](https://github.com/pmmp/PocketMine-MP)  
-A server software for Minecraft: Bedrock Edition in PHP  
+[Nukkit GitHub](https://github.com/Nukkit/Nukkit)
+Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition
+
+## [PocketMine MP](/game_eggs/minecraft/bedrock/pocketmine_mp)
+
+[PocketMine MP](https://github.com/pmmp/PocketMine-MP)
+A server software for Minecraft: Bedrock Edition in PHP
diff --git a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json
index 31507ac9..9bd191e3 100644
--- a/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json
+++ b/game_eggs/minecraft/bedrock/bedrock/egg-vanilla-bedrock.json
@@ -4,13 +4,15 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-04T00:38:57+03:00",
+    "exported_at": "2022-01-22T05:42:40-05:00",
     "name": "Vanilla Bedrock",
     "author": "parker@parkervcp.com",
     "description": "Bedrock Edition (also known as the Bedrock Version, Bedrock Codebase, Bedrock Engine or just Bedrock) refers to the multi-platform family of editions of Minecraft developed by Mojang AB, Microsoft Studios, 4J Studios, and SkyBox Labs. Prior to this term, as the engine originated with Pocket Edition, this entire product family was referred to as \"Pocket Edition\", \"MCPE\", or \"Pocket\/Windows 10 Edition\".",
-    "features": null,
+    "features": [
+        "pid_limit"
+    ],
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/bedrock_server",
@@ -83,4 +85,4 @@
             "rules": "required|string|in:true,false"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json b/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json
index 07044e87..598e5697 100644
--- a/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json
+++ b/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json
@@ -8,12 +8,15 @@
     "name": "GoMint",
     "author": "parker@parkervcp.com",
     "description": "A performant and stable Minecraft server software for the Bedrock Edition that comes with a modern API and support for Java 11 LTS.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java --add-opens java.base\/java.nio=io.netty.common --add-exports java.base\/jdk.internal.misc=io.netty.common -p modules -m gomint.server\/io.gomint.server.Bootstrap",
@@ -31,4 +34,4 @@
         }
     },
     "variables": []
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/bedrock/nukkit/README.md b/game_eggs/minecraft/bedrock/nukkit/README.md
index 87b26676..c38e7b83 100644
--- a/game_eggs/minecraft/bedrock/nukkit/README.md
+++ b/game_eggs/minecraft/bedrock/nukkit/README.md
@@ -1,8 +1,9 @@
-# Now abandoned. Please use NukkitX by Cloudburst.
-[NukkitX](https://github.com/CloudburstMC/Nukkit)
 # Nukkit
 
-[Nukkit GitHub](https://github.com/Nukkit/Nukkit)  
+[Old Nukkit GitHub](https://github.com/Nukkit/Nukkit)
 
-Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition  
+## Nukkit is Abandoned, uses NukkitX now
 
+[NukkitX](https://github.com/CloudburstMC/Nukkit)
+
+Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition
diff --git a/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json b/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json
index aefd6814..afb85499 100644
--- a/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json
+++ b/game_eggs/minecraft/bedrock/nukkit/egg-nukkit.json
@@ -4,25 +4,29 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T03:55:04+03:00",
+    "exported_at": "2021-12-16T13:31:45-05:00",
     "name": "Nukkit",
     "author": "parker@parkervcp.com",
-    "description": "Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition\r\n\r\nhttps:\/\/nukkit.io\/",
+    "description": "Nukkit is a Nuclear-Powered Server Software For Minecraft: Pocket Edition\r\n\r\nhttps:\/\/cloudburstmc.org",
     "features": null,
     "images": [
-        "quay.io\/pterodactyl\/core:java-glibc"
+        "quay.io\/pterodactyl\/core:java-glibc",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "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            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\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}",
         "stop": "stop"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Nukkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl openssl\r\n\r\ncd \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    wget ${MODIFIED_DOWNLOAD} -O ${SERVER_JARFILE}\r\nelif [ -z \"${NUKKIT_VERSION}\" ] || [ \"${NUKKIT_VERSION}\" == \"latest\" ]; then\r\n    wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n    wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n    wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n    wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/server.properties\r\nfi",
+            "script": "#!\/bin\/ash\r\n# Nukkit Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache curl openssl\r\n\r\ncd \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    wget ${MODIFIED_DOWNLOAD} -O ${SERVER_JARFILE}\r\nelif [ -z \"${NUKKIT_VERSION}\" ] || [ \"${NUKKIT_VERSION}\" == \"latest\" ]; then\r\n    wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/lastSuccessfulBuild\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nelse\r\n    wget https:\/\/ci.opencollab.dev\/job\/NukkitX\/job\/Nukkit\/job\/master\/${NUKKIT_VERSION}\/artifact\/target\/nukkit-1.0-SNAPSHOT.jar -O ${SERVER_JARFILE}\r\nfi\r\n\r\nif [ ! -f nukkit.yml ]; then\r\n    wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/nukkit.yml\r\nfi\r\n\r\nif [ ! -f server.properties ]; then\r\n    wget https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/nukkit\/server.properties\r\nfi\r\n\r\necho -s \"Install completed!\"",
             "container": "alpine:3.10",
             "entrypoint": "ash"
         }
@@ -39,7 +43,7 @@
         },
         {
             "name": "Download Path",
-            "description": "A URL to use to download Spigot rather than building it on the server. This is not user viewable. Use <code>{{DL_VERSION}}<\/code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).",
+            "description": "A URL to use to download Nukkit rather than building it on the server. This is not user viewable. Use <code>{{DL_VERSION}}<\/code> in the URL to automatically insert the assigned version into the URL. If you do not enter a URL Spigot will build directly in the container (this will fail on low memory containers).",
             "env_variable": "DL_PATH",
             "default_value": "",
             "user_viewable": false,
@@ -56,4 +60,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json
index 0eaf57b8..aebd5da2 100644
--- a/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json
+++ b/game_eggs/minecraft/bedrock/pocketmine_mp/egg-pocketmine-m-p.json
@@ -4,56 +4,38 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-21T11:31:41+02:00",
+    "exported_at": "2021-12-11T19:52:34+00:00",
     "name": "PocketmineMP",
     "author": "info@swisscrafting.ch",
     "description": "Pocketmine Egg\r\nby onekintaro from swisscrafting.ch\r\nwith the nice help from #eggs Channel on Pterodactyl-Discord :)",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/bin\/php7\/bin\/php .\/PocketMine-MP.phar --no-wizard --disable-ansi",
     "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}",
-        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"server.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \")! For help, type \"\r\n}",
+        "logs": "{}",
         "stop": "stop"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl jq\r\n\r\ncd \/mnt\/server\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_LINK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n## this is a simple script to validate a download url actaully exists\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\"]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} > PocketMine-MP.phar\r\n\r\necho -e \"\\n downloading latest php build from pocketmine\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\necho -e \"\\n getting default server.properties\"\r\ncurl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties > server.properties\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n\r\n# This is already installed in our Script container image. Leaving it here for future reference | apt install -y curl jq\r\n\r\ncd \/mnt\/server\r\n\r\n# Restrict versions to latest pm3 and pm4 for now.\r\nif [[ \"${VERSION}\" == \"pm4\" ]] || [[ \"${VERSION}\" == \"\" ]]; then\r\n  DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=stable | grep 'download_url' | cut -d '\"' -f 4)\r\n  echo -e \"Downloading latest PocketMine 4 from ${DOWNLOAD_LINK}\"\r\n  curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelif [[ \"${VERSION}\" == \"pm3\" ]]; then\r\n  DOWNLOAD_LINK=$(curl -ssL https:\/\/update.pmmp.io\/api?channel=pm3 | grep 'download_url' | cut -d '\"' -f 4)\r\n  echo -e \"Downloading latest PocketMine 3 from ${DOWNLOAD_LINK}\"\r\n  curl -ssL \"${DOWNLOAD_LINK}\" -o PocketMine-MP.phar\r\nelse\r\n  echo -e \"Unknown version ${VERSION}\"\r\n  exit 1\r\nfi\r\n\r\necho -e \"\\n downloading latest php build from PocketMine https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\"\r\ncurl -sSL -o php.binary.tar.gz https:\/\/jenkins.pmmp.io\/job\/PHP-8.0-Aggregate\/lastStableBuild\/artifact\/PHP-8.0-Linux-x86_64.tar.gz\r\n\r\nif [[ ! -f server.properties ]]; then\r\n  echo -e \"\\n downloading default server.properties\"\r\n  curl -sSL https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/bedrock\/pocketmine_mp\/server.properties >server.properties\r\nfi\r\n\r\necho -e \"\\n unpacking php binaries\"\r\ntar -xzvf php.binary.tar.gz\r\n\r\necho -e \"\\n removing php packages\"\r\nrm -rf \/mnt\/server\/php.binary.tar.gz\r\n\r\necho -e \"\\n configuring PHP extensions library directory\"\r\nEXTENSION_DIR=$(find \"bin\" -name *debug-zts*)\r\ngrep -q '^extension_dir' bin\/php7\/bin\/php.ini && sed -i'bak' \"s{^extension_dir=.*{extension_dir=\\\"$EXTENSION_DIR\\\"{\" bin\/php7\/bin\/php.ini || echo \"extension_dir=\\\"$EXTENSION_DIR\\\"\" >>bin\/php7\/bin\/php.ini\r\n\r\necho -e \"\\n creating files and folders\"\r\ntouch banned-ips.txt banned-players.txt ops.txt white-list.txt server.log\r\nmkdir -p players worlds plugins resource_packs\r\n\r\necho -e \"\\n\\nInstall script completed. Enjoy!\"",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
     "variables": [
         {
-            "name": "PocketmineMP Version",
-            "description": "Version from Github",
+            "name": "Version to install [pm3 or pm4]",
+            "description": "Latest PocketMine version to install. Valid options: pm3 and pm4",
             "env_variable": "VERSION",
-            "default_value": "latest",
+            "default_value": "pm4",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:20"
-        },
-        {
-            "name": "Github Package",
-            "description": "",
-            "env_variable": "GITHUB_PACKAGE",
-            "default_value": "pmmp\/PocketMine-MP",
-            "user_viewable": false,
-            "user_editable": false,
-            "rules": "required|string|max:20"
-        },
-        {
-            "name": "Match",
-            "description": "",
-            "env_variable": "MATCH",
-            "default_value": "PocketMine-MP.phar",
-            "user_viewable": false,
-            "user_editable": false,
-            "rules": "required|string|max:20"
+            "rules": "required|string|in:pm3,pm4"
         }
     ]
 }
\ No newline at end of file
diff --git a/game_eggs/minecraft/java/README.md b/game_eggs/minecraft/java/README.md
index c2552ef8..af6d5ae3 100644
--- a/game_eggs/minecraft/java/README.md
+++ b/game_eggs/minecraft/java/README.md
@@ -5,99 +5,157 @@ It’s a game about placing blocks and going on adventures
 It’s set in infinitely-generated worlds of wide open terrain - icy mountains, swampy bayous, vast pastures and much more - filled with secrets, wonders and peril!
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
-## Cuberite
-[Cuberite](https://cuberite.org)
+The minecraft server requires a single port for access (default 25565) but plugins or mods may require extra ports to enabled for the server.
+
+## [Cuberite](cuberite)
+
+[Cuberite Website](https://cuberite.org)
 A lightweight, fast and extensible game server for Minecraft
 
-## Fabric
-[Fabric](https://fabricmc.net)  
+## [Fabric](fabric)
+
+[Fabric Website](https://fabricmc.net)
 Fabric is a lightweight, experimental modding toolchain for Minecraft.
 
-## Feather
-[Feather](https://github.com/feather-rs/feather)  
-An experimental Minecraft server implementation in Rust 
+## [Feather](feather)
 
-## Forge 
-[Forge MC](https://files.minecraftforge.net)  
-This is a direct fork of the default forge service  
-- Has a version detection fix for "latest"  
+[Feather GitHub](https://github.com/feather-rs/feather)
+An experimental Minecraft server implementation in Rust
 
-[Curse Generic](https://www.curseforge.com)  
-A generic service to pull forge mod packs from the curseforge site.  
+## Forge Based
 
-[Magma](https://magmafoundation.org)
+### [Forge](forge/forge)
+
+[Forge MC Website](https://files.minecraftforge.net)
+This is a direct fork of the default forge service
+
+- Has a version detection fix for "latest"
+
+### [CurseForge Generic](forge/curseforge-generic)
+
+[CurseForge Generic Website](https://www.curseforge.com)
+A generic service to pull forge mod packs from the curseforge site.
+
+## Glowstone 
+[Glowstone](https://glowstone.net/)
+Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper.
+
+### [Magma](magma)
+
+[Magma Website](https://magmafoundation.org)
 Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.
 
-## FTB Packs
-[FTB Modpacks](https://api.modpacks.ch)
+### [Krypton](krypton)
+
+[Krypton GitHub](https://github.com/KryptonMC/Krypton)
+A fast, lightweight Minecraft server written in Kotlin.
+
+### [Mohist](mohist)
+
+[Mohist Github](https://github.com/Mohist-Community/Mohist)
+Mohist is a minecraft forge server software that implements the Paper/Spigot/Bukkit API.
+
+## [FTB Packs](ftb)
+
+[FTB Modpacks API](https://api.modpacks.ch)
 A generic service to pull FTB modpacks from api.modpacks.ch.
 There are 2 ways to install a server through this service.
 The first method only requires you to know the modpacks name and version.
 The second method requires you to know the id for both the modpack and version in the api.
 
-**Method 1 (Recommended)**
+### Method 1 (Recommended)
+
 - FTB_SEARCH_TERM: the modpack name to query for, must be at least 4 characters long.
   EX: for FTB: Interactions you would do "interactions".
 - FTB_VERSION_STRING: the string version that you want to install.
   EX: for FTB: Interactions 2.0.2, you would put "2.0.2".
-  
-**Method 2**
+
+### Method 2
+
 - FTB_MODPACK_ID: the id that directs to the modpack in the api.
-  EX: for FTB: Interactions the id would be "5". https://api.modpacks.ch/public/modpack/5
+  EX: for FTB: Interactions the id would be "5". `https://api.modpacks.ch/public/modpack/5`
 - FTB_MODPACK_VERSION_ID: the version id in the api.
-  EX: for FTB: Interactions 2.0.2 the id is "86". https://api.modpacks.ch/public/modpack/5/86
+  EX: for FTB: Interactions 2.0.2 the id is "86". `https://api.modpacks.ch/public/modpack/5/86`
 
 **NOTE**
 **Not all FTB packs come with a server.properties file, due to this the server.properties file
 may not get updated with the correct ip address and port at first launch.
-Please restart the server after first launch to fix this.**  
+Please restart the server after first launch to fix this.**
+
+## [NanoLimbo](nanolimbo)
+
+[NanoLimbo GitHub](https://github.com/Nan1t/NanoLimbo)
+A lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets.
+
+## Spigot Based
 
-## Spigot
 A collection of spigot and forked spigot eggs.
 
+### [Paper](paper)
+
 [PaperMC GitHub](https://github.com/PaperMC/Paper)
-High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies  
+High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies
 Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar.
 
-[Purpur](https://purpur.pl3x.net)
-Purpur is a fork of Paper and Tuinity with the goal of providing new and interesting configuration options, which allow for creating a unique gameplay experience not seen anywhere else
+### [Purpur](purpur)
+
+[Purpur Website](https://purpurmc.org/)
+Purpur is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features.
+
+### [Spigot](spigot)
+
+[Spigot Website](https://www.spigotmc.org)
+This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar.
 
-[Spigot](https://www.spigotmc.org)  
-This is a direct fork of the default spigot service with the added benefit of being able to build the spigot jar.  
 - (It's noted that building the jar is intensive and time consuming)
 
-[Mohist Github](https://github.com/Mohist-Community/Mohist)
-Fork of Spigot focused on performance optimizations.
+### [Airplane](airplane)
 
 [Airplane Github](https://github.com/TECHNOVE/Airplane)
-A stable, optimized and fast Paper fork.
+A stable, optimized and well supported Paper fork.
 
-[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity) 
+### [Tuinity](tuinity)
+
+[Tuinity GitHub](https://github.com/Spottedleaf/Tuinity)
 Fork of Paper aimed at improving server performance at high playercounts.
 
-
 ## Sponge Powered
-[SpongeForge](https://www.spongepowered.org)
+
+### [SpongeForge](spongeforge)
+
+[SpongeForge Website](https://www.spongepowered.org)
 SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform.
 
-[SpongeVanilla](https://www.spongepowered.org)
+### [SpongeVanilla](spongevanilla)
+
+[SpongeVanilla Website](https://www.spongepowered.org)
 A community-driven open source Minecraft: Java Edition modding platform.
 
-## Technic Packs
-[Hexxit](https://www.technicpack.net/modpack/hexxit)  
-Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed!  
+## [Technic Packs](technic)
 
-[Blightfall](https://www.technicpack.net/modpack/blightfall)  
-Blightfall is a combination modpack and adventure map about surviving on an alien planet.  
+### [Hexxit](technic/hexxit)
 
-[Tekkit Legends](https://www.technicpack.net/modpack/tekkit-legends)  
+[Hexxit Modpack Page](https://www.technicpack.net/modpack/hexxit)
+Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed!
+
+### [Blightfall](technic/blightfall)
+
+[Blightfall Modpack Page](https://www.technicpack.net/modpack/blightfall)
+Blightfall is a combination modpack and adventure map about surviving on an alien planet.
+
+### [Tekkit Legends](technic/technic-legends)
+
+[Tekkit Legends Modpack Page](https://www.technicpack.net/modpack/tekkit-legends)
 The ancient power of Tekkits past return in this legendary pack!
 
-[Tekkit Classic](https://www.technicpack.net/modpack/tekkit.552560)
-The official Tekkit Classic modpack. Build factories, automate crafting!  
+### [Tekkit Classic](technic/tekkit-classic)
+
+[Tekkit Classic Modpack Page](https://www.technicpack.net/modpack/tekkit.552560)
+The official Tekkit Classic modpack. Build factories, automate crafting!
+
+## [VanillaCord](vanillacord)
 
 ## VanillaCord
 [VanillaCord](https://github.com/ME1312/VanillaCord)
-VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers
\ No newline at end of file
+VanillaCord adds support for BungeeCord's ip-forwarding option on vanilla Minecraft servers.
diff --git a/game_eggs/minecraft/java/airplane/README.md b/game_eggs/minecraft/java/airplane/README.md
index 04751ebf..5771f165 100644
--- a/game_eggs/minecraft/java/airplane/README.md
+++ b/game_eggs/minecraft/java/airplane/README.md
@@ -1,13 +1,14 @@
 # Airplane
-### From their [Github](https://github.com/TECHNOVE/Airplane)
-A stable, optimized and fast Paper fork.
 
+A stable, optimized, well supported Paper fork.
+
+[Airplane Github](https://github.com/TECHNOVE/Airplane)
+
+## Minimum RAM warning
 
-### Minimum RAM warning
 Approximately 2048MB
 
-
-### Server Ports
+## Server Ports
 
 | Port    | default |
 |---------|---------|
diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json
index aa0ca689..764a8679 100644
--- a/game_eggs/minecraft/java/airplane/egg-airplane.json
+++ b/game_eggs/minecraft/java/airplane/egg-airplane.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-25T09:45:04+02:00",
+    "exported_at": "2021-12-09T13:31:17-05:00",
     "name": "Airplane",
     "author": "info@ttr3.eu",
     "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane",
     "features": [
-        "eula"
+        "eula",
+        "java_version",
+        "pid_limit"
     ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
         "ghcr.io\/pterodactyl\/yolks:java_16",
-        "ghcr.io\/pterodactyl\/yolks:java_11"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -59,4 +63,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/cuberite/README.md b/game_eggs/minecraft/java/cuberite/README.md
index 495a718b..f4c97196 100644
--- a/game_eggs/minecraft/java/cuberite/README.md
+++ b/game_eggs/minecraft/java/cuberite/README.md
@@ -2,11 +2,14 @@
 
 A lightweight, fast and extensible game server for Minecraft
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[Cuberite Website](https://cuberite.org/)
+[Cuberite GitHub](https://github.com/cuberite/cuberite)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port     | default |
 |----------|---------|
 | Game     | 25565   |
-| WebAdmin | 8080    |
\ No newline at end of file
+| WebAdmin | 8080    |
diff --git a/game_eggs/minecraft/java/cuberite/egg-cuberite.json b/game_eggs/minecraft/java/cuberite/egg-cuberite.json
index a99ef76d..ca8c546b 100644
--- a/game_eggs/minecraft/java/cuberite/egg-cuberite.json
+++ b/game_eggs/minecraft/java/cuberite/egg-cuberite.json
@@ -1,14 +1,18 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-08T17:25:20-08:00",
+    "exported_at": "2021-11-26T00:05:33+00:00",
     "name": "Cuberite",
     "author": "parker@parkervcp.com",
     "description": "A lightweight, fast and extensible game server for Minecraft",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/Cuberite",
     "config": {
         "files": "{\r\n    \"settings.ini\": {\r\n        \"parser\": \"ini\",\r\n        \"find\": {\r\n            \"Server.Ports\": \"{{server.build.default.port}}\",\r\n            \"Server.Description\": \"{{server.build.env.SERV_DESC}}\"\r\n        }\r\n    },\r\n    \"webadmin.ini\": {\r\n        \"parser\": \"ini\",\r\n        \"find\": {\r\n            \"User:admin.Password\": \"{{server.build.env.ADMIN_PASS}}\",\r\n            \"WebAdmin.Ports\": \"{{server.build.env.WEB_PORT}}\"\r\n        }\r\n    }\r\n}",
@@ -18,8 +22,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -52,4 +56,4 @@
             "rules": "required|integer|between:1,65535"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/fabric/README.MD b/game_eggs/minecraft/java/fabric/README.MD
index 745eced2..1da85717 100644
--- a/game_eggs/minecraft/java/fabric/README.MD
+++ b/game_eggs/minecraft/java/fabric/README.MD
@@ -2,9 +2,11 @@
 
 Fabric is a lightweight, experimental modding toolchain for Minecraft.
 
-## Server Ports
-The fabric server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[Fabric Website](https://fabricmc.net/)
 
+## Server Ports
+
+The fabric server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
diff --git a/game_eggs/minecraft/java/fabric/egg-fabric.json b/game_eggs/minecraft/java/fabric/egg-fabric.json
index b7063d16..8aaa9342 100644
--- a/game_eggs/minecraft/java/fabric/egg-fabric.json
+++ b/game_eggs/minecraft/java/fabric/egg-fabric.json
@@ -4,18 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:30:32+03:00",
+    "exported_at": "2021-12-09T13:31:08-05:00",
     "name": "Fabric",
     "author": "accounts@bofanodes.io",
     "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.",
     "features": [
-        "eula"
+        "eula",
+        "java_version",
+        "pid_limit"
     ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -27,7 +29,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Enable snapshots\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n  MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== true )|.version' | head -n1)\r\nelif [ \"$MC_VERSION\" == \"snapshot\" ]; then\r\n  MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== false )|.version' | head -n1)\r\nfi\r\n\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\n  FABRIC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/installer | jq -r '.[0].version')\r\nfi\r\nwget -O fabric-installer.jar https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\njava -jar fabric-installer.jar server -mcversion $MC_VERSION -downloadMinecraft\r\necho -e \"Install Complete\"",
+            "script": "#!\/bin\/bash\r\n# Fabric MC Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl jq unzip dos2unix wget\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Enable snapshots\r\nif [ -z \"$MC_VERSION\" ] || [ \"$MC_VERSION\" == \"latest\" ]; then\r\n  MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== true )|.version' | head -n1)\r\nelif [ \"$MC_VERSION\" == \"snapshot\" ]; then\r\n  MC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/game | jq -r '.[] | select(.stable== false )|.version' | head -n1)\r\nfi\r\n\r\nif [ -z \"$FABRIC_VERSION\" ] || [ \"$FABRIC_VERSION\" == \"latest\" ]; then\r\n  FABRIC_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/installer | jq -r '.[0].version')\r\nfi\r\n\r\nif [ -z \"$LOADER_VERSION\" ] || [ \"$LOADER_VERSION\" == \"latest\" ]; then\r\n  LOADER_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/loader | jq -r '.[] | select(.stable== true )|.version' | head -n1)\r\nelif [ \"$LOADER_VERSION\" == \"snapshot\" ]; then\r\n  LOADER_VERSION=$(curl -sSL https:\/\/meta.fabricmc.net\/v2\/versions\/loader | jq -r '.[] | select(.stable== false )|.version' | head -n1)\r\nfi\r\n\r\nwget -O fabric-installer.jar https:\/\/maven.fabricmc.net\/net\/fabricmc\/fabric-installer\/$FABRIC_VERSION\/fabric-installer-$FABRIC_VERSION.jar\r\njava -jar fabric-installer.jar server -mcversion $MC_VERSION -loader $LOADER_VERSION -downloadMinecraft\r\necho -e \"Install Complete\"",
             "container": "openjdk:11-jdk-slim",
             "entrypoint": "bash"
         }
@@ -59,6 +61,15 @@
             "user_viewable": true,
             "user_editable": true,
             "rules": "required|string|between:3,15"
+        },
+        {
+            "name": "Fabric Loader Version",
+            "description": "The version of Fabric Loader to install.",
+            "env_variable": "LOADER_VERSION",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|between:3,15"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/feather/README.md b/game_eggs/minecraft/java/feather/README.md
index 927f8d84..a5d3accc 100644
--- a/game_eggs/minecraft/java/feather/README.md
+++ b/game_eggs/minecraft/java/feather/README.md
@@ -2,10 +2,12 @@
 
 An experimental Minecraft server implementation written in Rust.
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[Feather GitHub](https://github.com/feather-rs/feather)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/feather/egg-feather.json b/game_eggs/minecraft/java/feather/egg-feather.json
index 882e525a..d1181ec8 100644
--- a/game_eggs/minecraft/java/feather/egg-feather.json
+++ b/game_eggs/minecraft/java/feather/egg-feather.json
@@ -1,14 +1,18 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-12T16:29:02+00:00",
+    "exported_at": "2021-11-26T00:03:20+00:00",
     "name": "Feather",
     "author": "parker@parkervcp.com",
     "description": "An experimental Minecraft server implementation written in Rust.",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/feather-server",
     "config": {
         "files": "{\r\n    \"feather.toml\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"port\": \"port = {{server.build.default.port}}\",\r\n            \"address\": \"address = \\\"0.0.0.0\\\"\"\r\n        }\r\n    }\r\n}",
diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/README.md b/game_eggs/minecraft/java/forge/curseforge-generic/README.md
index cc1647db..31a4eb0e 100644
--- a/game_eggs/minecraft/java/forge/curseforge-generic/README.md
+++ b/game_eggs/minecraft/java/forge/curseforge-generic/README.md
@@ -1,18 +1,18 @@
 # Forge Generic
 
-### This is a generic egg for curseforge modpacks
+## This is a generic egg for curseforge modpacks
 
-You will need to give it a modpack ID. The ID for BOFA mods is `375152` for example.  
+You will need to give it a modpack ID. The ID for BOFA mods is `375152` for example.
 This can be found on the modpack page in the `About Project` section in the upper right corner.
 
-This will grab the latest release when the version is set to latest. 
+This will grab the latest release when the version is set to latest.
 
 It "should" grab versions of the pack based on the modpack version numbers
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json
index 00d94e28..8cb53d17 100644
--- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json
+++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:29:22+03:00",
+    "exported_at": "2022-01-24T02:52:47+01:00",
     "name": "Curseforge Generic",
     "author": "parker@parkervcp.com",
     "description": "A generic egg for a forge modpack",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "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.jar",
@@ -25,7 +29,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n    apt update\r\n    apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n    # get json data to work with\r\n    echo -e \"Curling the json for the modpack\"\r\n    echo -e \"running: curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\"\r\n    JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID})\r\n\r\n    # if no modpack version is set or is set to latest\r\n    if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n        echo -e \"Getting latest download url\"\r\n        # parse data to get the download url\r\n        FILE_ID=$(echo -e ${JSON_DATA} | jq -r .defaultFileId)\r\n        echo -e \"File ID is: ${FILE_ID}\"\r\n        if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n            FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n            DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n        else\r\n            DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n        fi\r\n        echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n    else\r\n        echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n        # parse files for version match\r\n        FILES_JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/files)\r\n        # get element number to get the exact location in the json\r\n        FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n        # if there wasn't a match default to latest\r\n        if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n            echo -e \"No matching version found\"\r\n            echo -e \"defaulting to latest\"\r\n            DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n        else\r\n            echo -e \"Version match found\"\r\n            DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n            echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n        fi\r\n    fi\r\n    ## download modpack files\r\n    cd \/mnt\/server\r\n    echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n    curl -L \"${DOWNLOAD_URL}\" -o server.zip\r\n    unzip -o server.zip\r\n    rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n    echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n    if [ -f \/mnt\/server\/*installer.jar ]; then\r\n        java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n    else\r\n        echo \"No forge installer found moving on.\"\r\n    fi\r\n    mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n    echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n    rm -rf *installer.jar\r\n    if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n        mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n        if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n            mv forge*.jar server.jar\r\n        else\r\n            mv *universal.jar server.jar  \r\n        fi\r\n    else\r\n        mv *universal.jar server.jar\r\n    fi\r\n}\r\n\r\nfunction json_download_prework {\r\n   mkdir -p \/mnt\/server\/mods\r\n   cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n    MANIFEST=\/mnt\/server\/manifest.json\r\n    for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n        projID=$(echo $mod | jq -r \".projectID\")\r\n        fileID=$(echo $mod | jq -r \".fileID\")\r\n        URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${projID}\/file\/${fileID}\/download-url)\r\n        # this is saving everything as \/mnt\/server\/mods\/download\r\n        echo \"Mod direct url: ${URL}\"\r\n        curl -JLO \"${URL}\"\r\n    done\r\n}\r\n\r\nfunction json_download_forge {\r\n    cd \/mnt\/server\r\n    FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n    MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n    FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n    FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n    \r\n    echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n    echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n    java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n    mv *universal.jar server.jar\r\n    rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n    if [ -d \/mnt\/server\/overrides ]; then\r\n        mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n        rmdir \/mnt\/server\/overrides\/mods\r\n        mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n        rmdir \/mnt\/server\/overrides\r\n    fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n    dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n    MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n    FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n    \r\n    FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n    echo -e ${FORGE_VERSION}\r\n    FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n    \r\n    echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n    echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n    java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n    mv *universal.jar server.jar\r\n    rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n    chmod +x \/mnt\/server\/settings.sh \r\n    . \/mnt\/server\/settings.sh \r\n    curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n    curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n    json_download_prework\r\n    json_download_mods\r\n    json_download_overrides\r\n    json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n    cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n    if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n        ftb_install\r\n    fi\r\nelse\r\n    forge_install\r\n    forge_cleanup\r\nfi\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"",
+            "script": "#!\/bin\/bash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir -p \/mnt\/server\r\nfi\r\n\r\nfunction install_required {\r\n    apt update\r\n    apt install -y curl jq unzip dos2unix\r\n}\r\n\r\nfunction get_download {\r\n    # get json data to work with\r\n    echo -e \"Curling the json for the modpack\"\r\n    echo -e \"running: curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\"\r\n    JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID})\r\n\r\n    # if no modpack version is set or is set to latest\r\n    if [ -z ${MODPACK_VERSION} ] || [ \"${MODPACK_VERSION}\" = \"latest\" ]; then\r\n        echo -e \"Getting latest download url\"\r\n        # parse data to get the download url\r\n        FILE_ID=$(echo -e ${JSON_DATA} | jq -r .defaultFileId)\r\n        echo -e \"File ID is: ${FILE_ID}\"\r\n        if [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .isServerPack\")\" == \"false\" ] && [ \"$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\" != \"null\" ]; then\r\n            FILE_ID=$(echo -e ${JSON_DATA} | jq -r --arg FILE_ID \"$FILE_ID\" \".latestFiles[] | select(.id==$FILE_ID) | .serverPackFileId\")\r\n            DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n        else\r\n            DOWNLOAD_URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/file\/${FILE_ID}\/download-url)\r\n        fi\r\n        echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n    else\r\n        echo -e \"Looking for download url for version ${MODPACK_VERSION}\"\r\n        # parse files for version match\r\n        FILES_JSON_DATA=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${MODPACK_ID}\/files)\r\n        # get element number to get the exact location in the json\r\n        FILES_JSON_ELEMENT=$(echo -e ${FILES_JSON_DATA} | jq --arg VERSION \"${MODPACK_VERSION}\" '.[] | select(.displayName) | .displayName | contains($VERSION)' | grep -n true | cut -f1 -d: | tail -1)\r\n        # if there wasn't a match default to latest\r\n        if [ ! -z ${FILES_JSON_ELEMENT} ]; then\r\n            echo -e \"No matching version found\"\r\n            echo -e \"defaulting to latest\"\r\n            DOWNLOAD_URL=$(echo -e ${FILES_JSON_DATA} | jq --arg ELEMENT \"${FILES_JSON_ELEMENT}\" '.[$ELEMENT|tonumber-1] | .downloadUrl')\r\n        else\r\n            echo -e \"Version match found\"\r\n            DOWNLOAD_URL=$(echo -e ${JSON_DATA} | jq -r .latestFiles[0].downloadUrl)\r\n            echo -e \"Download url set to ${DOWNLOAD_URL}\"\r\n        fi\r\n    fi\r\n    ## download modpack files\r\n    cd \/mnt\/server\r\n    echo \"Executing curl -L ${DOWNLOAD_URL} -o server.zip\"\r\n    curl -L -g \"${DOWNLOAD_URL}\" -o server.zip\r\n    unzip -o server.zip\r\n    rm -rf server.zip\r\n}\r\n\r\nfunction forge_install {\r\n    echo -e \"\\nInstalling forge server using the installer jar file.\\n\"\r\n    if [ -f \/mnt\/server\/*installer.jar ]; then\r\n        java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n    else\r\n        echo \"No forge installer found moving on.\"\r\n    fi\r\n    mv FTBServer.jar server.jar\r\n}\r\n\r\nfunction forge_cleanup {\r\n    echo -e \"\\nDeleting installer jar file and cleaning up.\\n\"\r\n    rm -rf *installer.jar\r\n    if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n        mv -v \/mnt\/server\/*\/* \/mnt\/server\/\r\n        if [ ! -f \/mnt\/server\/*universal.jar ]; then\r\n            mv forge*.jar server.jar\r\n        else\r\n            mv *universal.jar server.jar  \r\n        fi\r\n    else\r\n        mv *universal.jar server.jar\r\n    fi\r\n}\r\n\r\nfunction json_download_prework {\r\n   mkdir -p \/mnt\/server\/mods\r\n   cd \/mnt\/server\/mods\r\n}\r\n\r\nfunction json_download_mods {\r\n    MANIFEST=\/mnt\/server\/manifest.json\r\n    for mod in $(jq -c '.files[]' ${MANIFEST} ); do\r\n        projID=$(echo $mod | jq -r \".projectID\")\r\n        fileID=$(echo $mod | jq -r \".fileID\")\r\n        URL=$(curl -sSL https:\/\/addons-ecs.forgesvc.net\/api\/v2\/addon\/${projID}\/file\/${fileID}\/download-url)\r\n        # this is saving everything as \/mnt\/server\/mods\/download\r\n        echo \"Mod direct url: ${URL}\"\r\n        curl -JLO \"${URL}\"\r\n    done\r\n}\r\n\r\nfunction json_download_forge {\r\n    cd \/mnt\/server\r\n    FORGE=$(jq -r '.minecraft.modLoaders[0].id' \/mnt\/server\/manifest.json | cut -d '-' -f2)\r\n    MCVER=$(jq -r '.minecraft.version' \/mnt\/server\/manifest.json)\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n    FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n    FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n    \r\n    echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n    echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n    java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n    mv *universal.jar server.jar\r\n    rm installer.jar\r\n}\r\n\r\nfunction json_download_overrides {\r\n    if [ -d \/mnt\/server\/overrides ]; then\r\n        mv \/mnt\/server\/overrides\/mods\/* \/mnt\/server\/mods\/\r\n        rmdir \/mnt\/server\/overrides\/mods\r\n        mv \/mnt\/server\/overrides\/* \/mnt\/server\r\n        rmdir \/mnt\/server\/overrides\r\n    fi\r\n}\r\n\r\nfunction cfg_download_forge {\r\n    dos2unix settings.cfg # In case the pack was distributed with Windows-style line endings in the cfg file\r\n    MCVER=`grep 'MCVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n    FORGE=`grep 'FORGEVER' settings.cfg | sed 's\/;\/\/g' | cut -d '=' -f 2-`\r\n\r\n\tif [ ${MCVER} == \"1.7.10\" ] || [ ${MCVER} == \"1.8.9\" ]; then\r\n\t\tFORGE=\"${FORGE}-${MCVER}\"\r\n\tfi\r\n    \r\n    FORGE_VERSION=\"${MCVER}-${FORGE}\"\r\n    echo -e ${FORGE_VERSION}\r\n    FORGE_DOWNLOAD=https:\/\/maven.minecraftforge.net\/net\/minecraftforge\/forge\r\n    \r\n    echo -e \"\\nDownloading Forge Version $FORGE_VERSION\\n\"\r\n    echo -e \"Download link is $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION\"\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-installer.jar -o installer.jar\r\n    curl -sS $FORGE_DOWNLOAD\/$FORGE_VERSION\/forge-$FORGE_VERSION-universal.jar -o universal.jar\r\n    java -jar installer.jar --installServer || { echo -e \"install failed\"; exit 4; }\r\n    mv *universal.jar server.jar\r\n    rm installer.jar\r\n}\r\n\r\nfunction ftb_install {\r\n    chmod +x \/mnt\/server\/settings.sh \r\n    . \/mnt\/server\/settings.sh \r\n    curl https:\/\/s3.amazonaws.com\/Minecraft.Download\/versions\/${MCVER}\/minecraft_server.${MCVER}.jar -o ${JARFILE} \r\n    curl https:\/\/libraries.minecraft.net\/${LAUNCHWRAPPER} -o \/mnt\/server\/libraries\/${LAUNCHWRAPPER}\r\n}\r\n\r\ninstall_required\r\nget_download\r\n\r\nif [ -f \/mnt\/server\/manifest.json ]; then\r\n    json_download_prework\r\n    json_download_mods\r\n    json_download_overrides\r\n    json_download_forge\r\nelif [ -f \/mnt\/server\/settings.cfg ]; then\r\n    cfg_download_forge\r\nelif [ -f \/mnt\/server\/version.json ]; then\r\n    if [ \"$(cat \/mnt\/server\/version.json | jq -r '.packID | contains(\"FTB\")')\" == \"true\" ]; then\r\n        ftb_install\r\n    fi\r\nelse\r\n    forge_install\r\n    forge_cleanup\r\nfi\r\necho -e \"\\n\\nInstall completed succesfully, enjoy!\"",
             "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }
diff --git a/game_eggs/minecraft/java/forge/forge/README.md b/game_eggs/minecraft/java/forge/forge/README.md
index 634470a8..0417423e 100644
--- a/game_eggs/minecraft/java/forge/forge/README.md
+++ b/game_eggs/minecraft/java/forge/forge/README.md
@@ -1,15 +1,15 @@
 # Forge Generic
 
-### This is a generic egg for the forge standalone server
+## This is a generic egg for the forge standalone server
 
 This will download the latest jar for a specific forge version.
 
 this has a fix for the broken 1.7.10 and 1.8.9 versions forge has
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json
index 41e65001..5038cae9 100644
--- a/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json
+++ b/game_eggs/minecraft/java/forge/forge/egg-forge-enhanced.json
@@ -4,30 +4,32 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:29:51+03:00",
+    "exported_at": "2021-12-11T23:06:46+00:00",
     "name": "Forge Enhanced",
     "author": "parker@parkervcp.com",
     "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"
+        "eula",
+        "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_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
-    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -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}",
-        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\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"
     },
     "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/game_eggs/minecraft/java/ftb/README.md b/game_eggs/minecraft/java/ftb/README.md
index fcf4d375..8aa27f8a 100644
--- a/game_eggs/minecraft/java/ftb/README.md
+++ b/game_eggs/minecraft/java/ftb/README.md
@@ -1,31 +1,33 @@
-## FTB Modpacks
+# FTB Modpacks
+
 A generic service to pull FTB modpacks from api.modpacks.ch.
 There are 2 ways to install a server through this service.
 The first method only requires you to know the modpacks name and version.
 The second method requires you to know the id for both the modpack and version in the api.
 
-**Method 1 (Recommended)**
+## Method 1 (Recommended)
+
 - FTB_SEARCH_TERM: the modpack name to query for, must be at least 4 characters long.
   EX: for FTB: Interactions you would do "interactions".
 - FTB_VERSION_STRING: the string version that you want to install.
   EX: for FTB: Interactions 2.0.2, you would put "2.0.2".
-  
-**Method 2**
+
+## Method 2
+
 - FTB_MODPACK_ID: the id that directs to the modpack in the api.
-  EX: for FTB: Interactions the id would be "5". https://api.modpacks.ch/public/modpack/5
+  EX: for FTB: Interactions the id would be "5". `https://api.modpacks.ch/public/modpack/5`
 - FTB_MODPACK_VERSION_ID: the version id in the api.
-  EX: for FTB: Interactions 2.0.2 the id is "86". https://api.modpacks.ch/public/modpack/5/86
+  EX: for FTB: Interactions 2.0.2 the id is "86". `https://api.modpacks.ch/public/modpack/5/86`
 
 **NOTE**
 **Not all FTB packs come with a server.properties file, due to this the server.properties file
 may not get updated with the correct ip address and port at first launch.
-Please restart the server after first launch to fix this.**  
+Please restart the server after first launch to fix this.**
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
 | Game  | 25565   |
-
diff --git a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
index ae3bc611..ad59555a 100644
--- a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
+++ b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
@@ -8,12 +8,16 @@
     "name": "FTB-modpacks.ch Server",
     "author": "runemaster580@gmail.com",
     "description": "Since the release of the FTB APP, FTB modpacks are now distributed through modpacks.ch. This egg was developed for support for modpacks that are distributed through this.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "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 forge-server.jar",
@@ -68,4 +72,4 @@
             "rules": "nullable|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/glowstone/README.md b/game_eggs/minecraft/java/glowstone/README.md
new file mode 100644
index 00000000..feae6c7a
--- /dev/null
+++ b/game_eggs/minecraft/java/glowstone/README.md
@@ -0,0 +1,9 @@
+## Glowstone
+Glowstone is an open-source replacement for CraftBukkit, Spigot, and Paper.
+
+## Ports
+Similar to CraftBukkit and it's derivatives, it only requires a single port. Other plugins may require more ports.
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |
\ No newline at end of file
diff --git a/game_eggs/minecraft/java/glowstone/egg-glowstone.json b/game_eggs/minecraft/java/glowstone/egg-glowstone.json
new file mode 100644
index 00000000..18b66715
--- /dev/null
+++ b/game_eggs/minecraft/java/glowstone/egg-glowstone.json
@@ -0,0 +1,89 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2022-01-07T15:15:07-05:00",
+    "name": "Glowstone",
+    "author": "support@pterodactyl.io",
+    "description": "Glowstone is an open-source server implementation for Minecraft: Java Edition 1.12.2 and up.",
+    "features": null,
+    "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
+    ],
+    "file_denylist": [],
+    "startup": "java -Xms768M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -jar {{SERVER_JARFILE}}",
+    "config": {
+        "files": "{\r\n    \"config\/glowstone.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"server.port\": \"{{server.build.default.port}}\",\r\n            \"console.prompt\": \"\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Ready for connections.\"\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "stop"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y jq curl\r\n\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\nif [ $VERSION == *SNAPSHOT ]; then\r\n  echo -e \"Using Maven\"\r\n  \r\n  DOWNLOAD_URL=\"https:\/\/repo.glowstone.net\/service\/rest\/v1\/search\/assets\/download?group=net.glowstone&name=glowstone&sort=version&repository=snapshots&maven.baseVersion=${VERSION}&direction=desc&maven.classifier=\"\r\nelse \r\n    echo -e \"Using GitHub.\"\r\n\r\n    if [ -z \"${GITHUB_USER}\" ] && [ -z \"${GITHUB_OAUTH_TOKEN}\" ] ; then\r\n        echo -e \"using anon api call\"\r\n    else\r\n        echo -e \"user and oauth token set\"\r\n        alias curl='curl -u ${GITHUB_USER}:${GITHUB_OAUTH_TOKEN} '\r\n    fi\r\n    \r\n    ## get release info and download links\r\n    LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n    RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n    if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n    else\r\n        VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n        if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n            DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n        else\r\n            echo -e \"defaulting to latest release\"\r\n            DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n        fi\r\n    fi\r\nfi\r\n\r\necho -e \"Downloading...\"\r\ncurl --silent -L -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Generating configuration...\"\r\njava -jar ${SERVER_JARFILE} --generate-config\r\n\r\necho -e \"Install Complete\"",
+            "container": "eclipse-temurin:8-jdk",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Server Jar File",
+            "description": "The name of the server jarfile to run the server with.",
+            "env_variable": "SERVER_JARFILE",
+            "default_value": "glowstone.jar",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+        },
+        {
+            "name": "Glowstone Version",
+            "description": "The version of Glowstone to download. If it ends in SNAPSHOT, it will attempt to download from the maven repository.",
+            "env_variable": "VERSION",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "GitHub User",
+            "description": "GitHub user to use for api calls.\r\n\r\nThis only needs to be set if you hit the GitHub API too often across multiple servers.",
+            "env_variable": "GITHUB_USER",
+            "default_value": "",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "GitHub OAuth Token",
+            "description": "This can be either an OAuth or a Personal Access Token.\r\n\r\nThis is required for the install is you set a user.",
+            "env_variable": "GITHUB_OAUTH_TOKEN",
+            "default_value": "",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "GitHub Package",
+            "description": "The repository to download from.",
+            "env_variable": "GITHUB_PACKAGE",
+            "default_value": "GlowstoneMC\/Glowstone",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|string"
+        },
+        {
+            "name": "Match",
+            "description": "",
+            "env_variable": "MATCH",
+            "default_value": "glowstone.jar",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/game_eggs/minecraft/java/krypton/README.md b/game_eggs/minecraft/java/krypton/README.md
new file mode 100644
index 00000000..f45dd559
--- /dev/null
+++ b/game_eggs/minecraft/java/krypton/README.md
@@ -0,0 +1,17 @@
+# Krypton
+
+A fast, lightweight Minecraft server written in Kotlin
+
+[Krypton GitHub](https://github.com/KryptonMC/Krypton)
+
+## Server Ports
+
+Krypton only requires a single port to run, just like vanilla, though plugins may need extra ports.
+
+## Notes
+
+Please note that the server will not function correctly unless a pre-generated world is provided.
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/krypton/config.conf b/game_eggs/minecraft/java/krypton/config.conf
new file mode 100644
index 00000000..8fa9a591
--- /dev/null
+++ b/game_eggs/minecraft/java/krypton/config.conf
@@ -0,0 +1,92 @@
+# This is the main Krypton configuration file. All settings in this file apply globally
+# across the entire server, regardless of what they are.
+#
+# If you need any help with any of the settings in this file, you can join us on Discord
+# at https://discord.gg/4QuwYACDRX
+
+# Advanced settings. Don't touch these unless you know what you're doing.
+advanced {
+  # Whether to attempt to register the server as a JMX bean.
+  enable-jmx-monitoring=true
+  # Whether we should use the DSYNC option for saving region files to disk.
+  synchronize-chunk-writes=true
+}
+# Other settings that don't quite fit in anywhere else.
+other {
+  # If we should enable bStats metrics for the server
+  metrics=true
+  # The duration (in seconds) a single tick must take before the single tick profiler reports it.
+  save-threshold=5
+}
+# Proxy IP forwarding settings.
+proxy {
+  #
+  # The method to use for forwarding a connecting user's information on
+  # to Krypton from a proxy server. Supported values are:
+  # - NONE - Disable forwarding support completely
+  # - LEGACY - Use the BungeeCord/pre-1.13 method
+  # - MODERN - Use Velocity's modern forwarding protocol
+  # When any mode other than NONE is used, the server will be forced offline
+  # and will ONLY accept connections from proxies. No users will be able to
+  # direct connect.
+  mode=NONE
+  # The forwarding secret from Velocity. Only used in the MODERN forwarding protocol.
+  secret=""
+}
+# Settings for the GS4 query protocol listener. If you don't know what that means, don't touch these :)
+query {
+  # Whether to enable the query protocol.
+  enabled=false
+  # The port the query listener should listen on.
+  port=25566
+}
+# The main server settings.
+server {
+  # The threshold at which packets larger will be compressed. Set to -1 to disable.
+  compression-threshold=256
+  # The IP used by players to connect. 0.0.0.0 means listen on all interfaces.
+  ip="0.0.0.0"
+  # Whether the server authenticates users with Mojang.
+  online-mode=true
+  # The port used by players to connect.
+  port=25565
+}
+# Status configuration
+status {
+  # The upper limit of the player count. Any players that try to join when this is reached will be kicked.
+  max-players=20
+  # The message of the day. Supports legacy and hex codes (using &#).
+  motd="&#8000ffKrypton is a Minecraft server written in Kotlin!"
+}
+# Watchdog settings. The watchdog monitors the server for freezes.
+watchdog {
+  # The time (in milliseconds) before watchdog first warns you about the server not responding
+  early-warning-delay=10000
+  # How often (in milliseconds) watchdog should warn you in advanced that the server isn't responding
+  early-warning-interval=5000
+  # The message to send to players when we restart the server. Supports legacy and hex codes (&# format).
+  restart-message="&cServer closed."
+  # Whether we should attempt to restart the server if it crashes
+  restart-on-crash=true
+  # The script we should use to attempt to restart the server.
+  restart-script="./start.sh"
+  # The time (in seconds) that the server must not respond for before watchdog considers it dead.
+  timeout-time=60
+}
+# Global world configuration options
+world {
+  # The amount of time (in ticks) between automatic world saves.
+  autosave-interval=6000
+  # The default difficulty. Valid values are: 0-3 (legacy), peaceful, easy, normal and hard (case insensitive).
+  difficulty=normal
+  # Forces the above gamemode for all players in all worlds.
+  force-default-gamemode=false
+  # The gamemode for this world. Valid values are: 0-3 (legacy), survival, creative, adventure and spectator (case insensitive).
+  gamemode=survival
+  # If this server is in hardcore mode. Currently does nothing.
+  hardcore=false
+  # The name of the folder with the world to load in it.
+  name=world
+  # The render distance of the server. This is how many chunks you can see in front of you, excluding the one you are in.
+  view-distance=10
+}
diff --git a/game_eggs/minecraft/java/krypton/egg-krypton.json b/game_eggs/minecraft/java/krypton/egg-krypton.json
new file mode 100644
index 00000000..eed82973
--- /dev/null
+++ b/game_eggs/minecraft/java/krypton/egg-krypton.json
@@ -0,0 +1,57 @@
+{
+  "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+  "meta": {
+    "version": "PTDL_v1",
+    "update_url": null
+  },
+  "exported_at": "2021-05-09T06:18:25-04:00",
+  "name": "Krypton",
+  "author": "callum.seabrook@prevarinite.com",
+  "description": "A fast, lightweight Minecraft server written in Kotlin",
+  "features": [
+    "eula",
+    "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_17"
+],
+  "file_denylist": "",
+  "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JAR}}",
+  "config": {
+    "files": "{\r\n    \"config.conf\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"  port\": \"  port = {{server.build.default.port}}\",\r\n            \"  ip\": \"  ip = \\\"0.0.0.0\\\"\"\r\n        }\r\n    }\r\n}",
+    "startup": "{\r\n    \"done\": \")! Type \\\"help\\\" for help.\"\r\n}",
+    "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+    "stop": "stop"
+  },
+  "scripts": {
+    "installation": {
+      "script": "#!\/bin\/bash\r\n#\r\n# Krypton installation script for Pterodactyl\r\n# Created by BomBardyGamer\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt-get update\r\napt-get install -y curl jq unzip\r\n\r\ncd \/mnt\/server\r\nif [ -z \"${KRYPTON_VERSION}\" ] || [ \"${KRYPTON_VERSION}\" == \"latest\" ]; then\r\n    KRYPTON_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\nBASE_URL=\"https:\/\/ci.kryptonmc.org\/job\/Krypton\/${KRYPTON_VERSION}\"\r\nARTIFACT=`curl \"${BASE_URL}\/api\/json?tree=artifacts%5BrelativePath%5D\" | jq '.artifacts[0].relativePath' | sed 's\/\"\/\/g'`\r\n\r\ncurl -o ${SERVER_JAR} ${BASE_URL}\/artifact\/${ARTIFACT}\r\nunzip ${SERVER_JAR} \"config.conf\"",
+      "container": "debian:buster-slim",
+      "entrypoint": "bash"
+    }
+  },
+  "variables": [
+    {
+      "name": "Server JAR File",
+      "description": "The name of the server JAR to run the server with.",
+      "env_variable": "SERVER_JAR",
+      "default_value": "Krypton.jar",
+      "user_viewable": true,
+      "user_editable": true,
+      "rules": "required|string|max:20"
+    },
+    {
+      "name": "Krypton Version",
+      "description": "The version of Krypton to download and use.",
+      "env_variable": "KRYPTON_VERSION",
+      "default_value": "latest",
+      "user_viewable": true,
+      "user_editable": true,
+      "rules": "required|alpha_num|between:1,6"
+    }
+  ]
+}
diff --git a/game_eggs/minecraft/java/magma/README.md b/game_eggs/minecraft/java/magma/README.md
index 51847897..f786b921 100644
--- a/game_eggs/minecraft/java/magma/README.md
+++ b/game_eggs/minecraft/java/magma/README.md
@@ -2,10 +2,12 @@
 
 Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[Magma Website](https://magmafoundation.org/)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json
index 79ba9949..49e63930 100644
--- a/game_eggs/minecraft/java/magma/egg-magma.json
+++ b/game_eggs/minecraft/java/magma/egg-magma.json
@@ -4,29 +4,32 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:28:39+03:00",
+    "exported_at": "2022-01-11T09:07:47-05:00",
     "name": "Magma",
     "author": "support@pterodactyl.io",
     "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "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}",
-        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \")! For help, type \"\r\n}",
+        "logs": "{}",
         "stop": "stop"
     },
     "scripts": {
         "installation": {
-            "script": "apt update\r\napt install -y curl\r\n\r\nif [ ! -d \/mnt\/server\/ ]; then\r\n    mkdir \/mnt\/server\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ ! -z ${MC_VERSION} ]; then\r\n    DOWNLOAD_LINK=https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/dev\/latest\/download\r\nelse\r\n    DOWNLOAD_LINK=https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12.2\/dev\/latest\/download\r\nfi\r\n\r\necho -e \"Download URL is ${DOWNLOAD_LINK}\"\r\n\r\n## validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ] ; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n## mv old server files\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n    echo -e \"moving old server.jar\"\r\n    mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_LINK}\"\r\ncurl -s -o ${SERVER_JARFILE} -sSL ${DOWNLOAD_LINK}\r\n\r\necho -e \"Install Complete\"",
-            "container": "debian:buster-slim",
+            "script": "apt 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# get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.16.5\/${BRANCH}\/latest\")\r\nOLD_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n\r\nif [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]]; then\r\n  echo -e \"Version not set. Defaulting to latest\"\r\n  DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\n\r\nelif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]]; then\r\n  CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/${MC_VERSION}\/${BRANCH}\/latest\")\r\n  DOWNLOAD_LINK=$(echo ${CUSTOM_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i installer.jar)\r\nelif [[ \"${MC_VERSION}\" == \"1.12\" ]]; then\r\n  CUSTOM_JSON=$(curl --silent \"https:\/\/api.magmafoundation.org\/api\/resources\/magma\/1.12\/${BRANCH}\/latest\")\r\n  DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i server.jar)\r\nelse\r\n  # Try to locate version by exact tag name. This will most likely always fail, because the tag names are in a weird format. Leaving it here just in case someone wants to fetch exact tag releases.\r\n  VERSION_CHECK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .tag_name')\r\n  if [[ \"${MC_VERSION}\" == \"${VERSION_CHECK}\" ]]; then\r\n    DOWNLOAD_LINK=$(echo ${OLD_JSON} | jq -r --arg MC_VERSION \"${MC_VERSION}\" '.[] | select(.tag_name==$MC_VERSION) | .assets[].browser_download_url' | grep -i installer.jar)\r\n  else\r\n    echo -e \"Specified ${MC_VERSION} version not found. Defaulting to latest\"\r\n    DOWNLOAD_LINK=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n  fi\r\nfi\r\n\r\n# validate download link\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then\r\n  echo -e \"Validating downlaod link\"\r\n  if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}; then\r\n    echo -e \"link is valid. setting download link to ${DOWNLOAD_LINK}\"\r\n    DOWNLOAD_LINK=${DOWNLOAD_LINK}\r\n  else\r\n    echo -e \"Download URL ${DOWNLOAD_LINK} is invalid. Terminating install.\"\r\n    exit 2\r\n  fi\r\nfi\r\n\r\nfunction downloadMagma {\r\n  echo -e \"running: curl -sSL -o installer.jar ${DOWNLOAD_LINK}\"\r\n  curl -sSL -o installer.jar -sSL ${DOWNLOAD_LINK}\r\n}\r\n\r\nif [[ $MC_VERSION =~ ^1\\.(16|17|18|19|20|21|22|23) ]] || [[ -z \"${MC_VERSION}\" ]] || [[ \"${MC_VERSION}\" == \"latest\" ]] ; then\r\n  downloadMagma\r\n  echo -e \"1.16.5 or newer version detected. Running installer\"\r\n  java -jar installer.jar --installServer || { echo -e \"install failed\" exit 4; }\r\n  mv forge-*.jar $SERVER_JARFILE\r\n  echo -e \"Deleting installer.jar file.\\n\"\r\n  rm -rf *installer.jar\r\nelse\r\n  downloadMagma\r\n  echo -e \"Older magma version detected. Skipping installer\"\r\n  mv installer.jar $SERVER_JARFILE\r\nfi\r\n\r\necho -e \"Install Complete\"",
+            "container": "openjdk:8-jdk-slim",
             "entrypoint": "bash"
         }
     },
@@ -36,18 +39,27 @@
             "description": "The name of the server jarfile to run the server with.",
             "env_variable": "SERVER_JARFILE",
             "default_value": "server.jar",
-            "user_viewable": false,
+            "user_viewable": true,
             "user_editable": false,
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         },
         {
             "name": "Minecraft Version",
-            "description": "Optional.\r\n\r\nSpecify vanilla version other than default 1.12.2.",
+            "description": "Optional.\r\n\r\nSpecify the version to install, such as 1.16 or 1.12. Leave empty or set latest to install latest",
             "env_variable": "MC_VERSION",
-            "default_value": "",
+            "default_value": "latest",
             "user_viewable": true,
             "user_editable": true,
             "rules": "nullable|string|max:20"
+        },
+        {
+            "name": "Branch [dev or stable]",
+            "description": "Branch to install. Valid options: dev or stable",
+            "env_variable": "BRANCH",
+            "default_value": "dev",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:dev,stable"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/mohist/README.MD b/game_eggs/minecraft/java/mohist/README.MD
index 825d5523..76f44ea4 100644
--- a/game_eggs/minecraft/java/mohist/README.MD
+++ b/game_eggs/minecraft/java/mohist/README.MD
@@ -1,10 +1,12 @@
 # Mohist
 
-Mohist is a Spigot fork that prioritizes performance optimizations.
+Mohist is a minecraft forge server software that implements the Paper/Spigot/Bukkit API.
+
+[Mohist Website](https://mohistmc.com/)
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
@@ -12,9 +14,10 @@ The minecraft server requires a single port for access (default 25565) but plugi
 
 ## Server Specific
 
-### Supported versions:
+### Supported versions
+
 - 1.16.4 series build 132+
 - 1.12.x series
-- 1.7.x series build 13+
+- 1.7.x series (discontinued) build 13+
 
-Requires changing Minecraft_Version variable on each new Minecraft version release.
\ No newline at end of file
+Requires changing Minecraft_Version variable on each new Minecraft version release.
diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json
index d52b6dc0..1dd2339b 100644
--- a/game_eggs/minecraft/java/mohist/egg-mohist.json
+++ b/game_eggs/minecraft/java/mohist/egg-mohist.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:28:24+03:00",
+    "exported_at": "2022-01-14T09:54:36+01:00",
     "name": "Mohist",
     "author": "alex.chang-lam@protonmail.com",
     "description": "Spigot fork with performance optimizations.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause",
@@ -25,7 +29,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\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 ${BUILD_VERSION} ]; then\r\n    DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n    DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_LINK}-server.jar; then\r\n        echo -e \"Download link is valid.\"\r\n    else\r\n        echo -e \"Link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n    echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n    exit\r\nfi",
+            "script": "#!\/bin\/bash\r\n# Mohist Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\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 ${BUILD_VERSION} ]; then\r\n    DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_VERSION}\/download\r\nelse\r\n    DOWNLOAD_LINK=https:\/\/mohistmc.com\/api\/${MC_VERSION}\/${BUILD_TYPE}\/download\r\nfi\r\n\r\n#Downloading jars\r\necho -e \"Download link is ${DOWNLOAD_LINK}\"\r\necho -e \"Downloading build version ${BUILD_VERSION}\"\r\nif [ ! -z \"${DOWNLOAD_LINK}\" ]; then \r\n    if curl --output \/dev\/null --silent --fail ${DOWNLOAD_LINK}; then\r\n        echo -e \"Download link is valid.\"\r\n    else\r\n        echo -e \"Link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -s -o server.jar -sS ${DOWNLOAD_LINK}\r\n\r\n#Checking if downloaded jars exist\r\nif [ ! -f .\/server.jar ]; then\r\n    echo \"!!! Error downloading build version ${BUILD_VERSION} !!!\"\r\n    exit\r\nfi",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -36,7 +40,7 @@
             "description": "The name of the jarfile to run the server with.",
             "env_variable": "SERVER_JARFILE",
             "default_value": "server.jar",
-            "user_viewable": false,
+            "user_viewable": true,
             "user_editable": false,
             "rules": "required|string|max:20"
         },
@@ -68,4 +72,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/nanolimbo/README.MD b/game_eggs/minecraft/java/nanolimbo/README.MD
new file mode 100644
index 00000000..4e8407cb
--- /dev/null
+++ b/game_eggs/minecraft/java/nanolimbo/README.MD
@@ -0,0 +1,14 @@
+# NanoLimbo
+
+A lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar.
+No plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down.
+
+[NanoLimbo Github](https://github.com/Nan1t/NanoLimbo)
+
+## Server Ports
+
+The nanolimbo server requires a single port for access (default 25565).
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json
new file mode 100644
index 00000000..fd99f086
--- /dev/null
+++ b/game_eggs/minecraft/java/nanolimbo/egg-nano-limbo.json
@@ -0,0 +1,63 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2022-03-02T18:33:43+01:00",
+    "name": "NanoLimbo",
+    "author": "mail@wuffy.eu",
+    "description": "This is lightweight minecraft limbo server, written on Java with Netty. The main goal of the project is maximum simplicity with a minimum number of sent and processed packets. This limbo is empty, there are no ability to set schematic building since this is not necessary. You can send useful information in chat or BossBar.\r\n\r\nNo plugins, no logs. The server is fully clear. It only able keep a lot of players while the main server is down.",
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
+    "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_8"
+    ],
+    "file_denylist": [],
+    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
+    "config": {
+        "files": "{\r\n    \"settings.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"bind.ip\": \"0.0.0.0\",\r\n            \"bind.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Server started on\"\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# NanoLimbo Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq git openssl bash bc apt-transport-https gnupg software-properties-common\r\n\r\nif [ -z \"${DOWNLOAD_URL}\" ]; then\r\n    GITHUB_PACKAGE=\"Nan1t\/NanoLimbo\"\r\n    MATCH=\"NanoLimbo-\"\r\n\r\n    ## get release info and download links\r\n    LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n    RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n    \r\n    if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n    else\r\n        VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n        if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n            DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n        else\r\n            echo -e \"defaulting to latest release\"\r\n            DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n        fi\r\n    fi\r\nelse\r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}.jar; then\r\n        echo -e \"Provided download link is valid. Proceeding to download\"\r\n    else\r\n        echo -e \"Provided download link is invalid. Exiting now\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Downloading server file...\"\r\necho -e \"performing curl -sSL ${DOWNLOAD_URL}\"\r\ncurl -sSL -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f \"settings.yml\" ]; then\r\necho \"Creating settings file...\"\r\ncurl -sSL -o settings.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/nanolimbo\/settings.yml\r\nfi",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Server jar File",
+            "description": "The name of the server jarfile to run the server with.",
+            "env_variable": "SERVER_JARFILE",
+            "default_value": "server.jar",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
+        },
+        {
+            "name": "Download URL",
+            "description": "A URL to use to download.\r\nThis is optional! Let this field empty for the latest version.",
+            "env_variable": "DOWNLOAD_URL",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string"
+        },
+        {
+            "name": "Version",
+            "description": "The version of NanoLimbo to download. Use \"latest\" for latest.",
+            "env_variable": "VERSION",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/game_eggs/minecraft/java/nanolimbo/settings.yml b/game_eggs/minecraft/java/nanolimbo/settings.yml
new file mode 100644
index 00000000..dc997c7a
--- /dev/null
+++ b/game_eggs/minecraft/java/nanolimbo/settings.yml
@@ -0,0 +1,115 @@
+#
+# NanoLimbo configuration
+#
+
+# Server's host address and port. Set ip empty to use public address
+bind:
+  ip: 'localhost'
+  port: 65535
+
+# Max amount of players can join to server
+# Set -1 to make it infinite
+maxPlayers: 100
+
+# Server's data in servers list
+ping:
+  description: '{"text": "&9NanoLimbo"}'
+  version: 'NanoLimbo'
+
+# Available dimensions: OVERWORLD, NETHER, THE_END
+dimension: THE_END
+
+# Whether to display the player in the player list
+# For 1.16.5 clients player list will be sent even if disabled, to avoid crash
+playerList:
+  enable: false
+  username: 'NanoLimbo'
+
+# Whether to display header and footer in player list
+headerAndFooter:
+  enable: false
+  header: '{"text": "&eWelcome!"}'
+  footer: '{"text": "&9NanoLimbo"}'
+
+# Spawn position in the world
+spawnPosition:
+  x: 0.0
+  y: 64.0
+  z: 0.0
+  yaw: 0.0
+  pitch: 0.0
+
+# Setup player's game mode
+# 0 - Survival
+# 1 - Creative (hide HP and food bar)
+# 2 - Adventure
+# 3 - Spectator (hide all UI bars)
+gameMode: 3
+
+# Server name which is shown under F3
+brandName:
+  enable: true
+  content: 'NanoLimbo'
+
+# Message sends when player join to server
+joinMessage:
+  enable: true
+  text: '{"text": "&eWelcome to the Limbo!"}'
+
+# BossBar displays when player join to server
+# Works on 1.9+ clients only
+bossBar:
+  enable: true
+  text: '{"text": "Welcome to the Limbo!"}'
+  health: 1.0
+  # Available colors: PINK, BLUE, RED, GREEN, YELLOW, PURPLE, WHITE
+  color: PINK
+  # Available divisions: SOLID, DASHES_6, DASHES_10, DASHES_12, DASHES_20
+  division: SOLID
+
+# Display title and subtitle
+title:
+  enable: true
+  # Set title text value empty, if you need only subtitle
+  title: '{"text": "&9&lWelcome!"}'
+  # Set subtitle text value empty, if you need only title
+  subtitle: '{"text": "&6NanoLimbo"}'
+  # Fade in time in ticks (1 sec = 20 ticks)
+  fadeIn: 10
+  # Stay time in ticks
+  stay: 100
+  # Fade out time in ticks
+  fadeOut: 10
+
+# Player info forwarding support.
+# Available types:
+#  - NONE
+#  - LEGACY
+#  - MODERN
+#  - BUNGEE_GUARD
+# Don't use secret if you not use MODERN type
+infoForwarding:
+  type: NONE
+  secret: '<YOUR_SECRET_HERE>'
+  tokens:
+    - '<BUNGEE_GUARD_TOKEN>'
+
+# Read timeout for connections in milliseconds
+readTimeout: 30000
+
+# Define log level. For production, I'd recommend to use level 2
+# Log levels:
+# 0 - Display only errors
+# 1 - Display errors, warnings
+# 2 - Display errors, warnings, info
+# 3 - Display errors, warnings, info, debug
+debugLevel: 2
+
+# Warning! Do not touch params of this block, if you not completely sure what is this!
+netty:
+  # Use Linux native transport type, if it possible
+  useEpoll: true
+  # EventLoopGroup threads count
+  threads:
+    bossGroup: 1
+    workerGroup: 4
\ No newline at end of file
diff --git a/game_eggs/minecraft/java/paper/README.MD b/game_eggs/minecraft/java/paper/README.MD
index 87eef00a..0b39fd4a 100644
--- a/game_eggs/minecraft/java/paper/README.MD
+++ b/game_eggs/minecraft/java/paper/README.MD
@@ -2,10 +2,12 @@
 
 Paper is the next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance.
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+Check out the [Paper Website](https://papermc.io/) for more information.
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/paper/egg-paper.json b/game_eggs/minecraft/java/paper/egg-paper.json
index ecabd8c5..bbb9de1b 100644
--- a/game_eggs/minecraft/java/paper/egg-paper.json
+++ b/game_eggs/minecraft/java/paper/egg-paper.json
@@ -4,18 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:03:08+03:00",
+    "exported_at": "2021-12-09T13:30:53-05:00",
     "name": "Paper",
     "author": "parker@pterodactyl.io",
     "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.",
     "features": [
-        "eula"
+        "eula",
+        "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_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -70,4 +72,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/purpur/README.md b/game_eggs/minecraft/java/purpur/README.md
index 59789e93..92735500 100644
--- a/game_eggs/minecraft/java/purpur/README.md
+++ b/game_eggs/minecraft/java/purpur/README.md
@@ -1,13 +1,14 @@
 # Purpur
 
-Purpur is a fork of Paper and Tuinity which provides new configuration options.
+Purpur is a drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features.
 
-See https://github.com/pl3xgaming/purpur for additional information.
+[Purpur GitHub](https://github.com/PurpurMC/Purpur)
+[Purpur Website](https://purpurmc.org/)
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json
index ff5ef25e..579bda6d 100644
--- a/game_eggs/minecraft/java/purpur/egg-purpur.json
+++ b/game_eggs/minecraft/java/purpur/egg-purpur.json
@@ -4,14 +4,17 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-17T01:51:57+03:00",
+    "exported_at": "2021-12-18T19:20:26-05:00",
     "name": "Purpur",
     "author": "purpur@birdflop.com",
-    "description": "Fork of Paper and Tuinity providing new configuration options.",
+    "description": "A drop-in replacement for Paper servers designed for configurability, and new fun and exciting gameplay features.",
     "features": [
-        "eula"
+        "eula",
+        "java_version",
+        "pid_limit"
     ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
         "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8"
@@ -26,9 +29,9 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Purpur Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update\r\napt install -y curl jq\r\n\r\nVER_EXISTS=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/ | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)?' | grep true`\r\nLATEST_PURPUR_VERSION=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/ | jq -r '.versions' | jq -r '.[0]?'`\r\n\r\nif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n    echo -e \"Chosen version is valid. Using version ${MINECRAFT_VERSION}\"\r\nelse\r\n    echo -e \"Chosen version is invalid. Defaulting to the latest Purpur version\"\r\n    MINECRAFT_VERSION=${LATEST_PURPUR_VERSION}\r\nfi\r\n\r\nBUILD_EXISTS=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/${MINECRAFT_VERSION}\/ | jq -r --arg BUILD $BUILD_NUMBER '.builds.all[] | contains($BUILD)?' | grep true`\r\nLATEST_PURPUR_BUILD=`curl -s https:\/\/api.pl3x.net\/v2\/purpur\/${MINECRAFT_VERSION}\/ | jq -r '.builds.latest'`\r\n\r\nif [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n    echo -e \"Chosen build is valid. Using version ${BUILD_NUMBER}\"\r\nelse\r\n    echo -e \"Chosen version is invalid. Using the latest Purpur build\"\r\n    BUILD_NUMBER=${LATEST_PURPUR_BUILD}\r\nfi\r\n\r\necho \"Version being downloaded\"\r\necho -e \"MC Version: ${MINECRAFT_VERSION}\"\r\necho -e \"Build: ${BUILD_NUMBER}\"\r\nDOWNLOAD_URL=https:\/\/api.pl3x.net\/v2\/purpur\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download \r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n    mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n    echo -e \"Downloading MC server.properties\"\r\n    curl -sSL -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/java\/server.properties\r\nfi",
-            "container": "debian:buster-slim",
-            "entrypoint": "bash"
+            "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=purpur\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n\techo -e \"Using supplied download url: ${DL_PATH}\"\r\n\tDOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n\tVER_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | contains($VERSION)' | grep true`\r\n\tLATEST_VERSION=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]'`\r\n\r\n\tif [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} version\"\r\n\t\tMINECRAFT_VERSION=${LATEST_VERSION}\r\n\tfi\r\n\t\r\n\tBUILD_EXISTS=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all | tostring | contains($BUILD)' | grep true`\r\n\tLATEST_BUILD=`curl -s https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n\t\r\n\tif [ \"${BUILD_EXISTS}\" == \"true\" ]; then\r\n\t\techo -e \"Build is valid for version ${MINECRAFT_VERSION}. Using build ${BUILD_NUMBER}\"\r\n\telse\r\n\t\techo -e \"Using the latest ${PROJECT} build for version ${MINECRAFT_VERSION}\"\r\n\t\tBUILD_NUMBER=${LATEST_BUILD}\r\n\tfi\r\n\t\r\n\tJAR_NAME=${PROJECT}-${MINECRAFT_VERSION}-${BUILD_NUMBER}.jar\r\n\t\r\n\techo \"Version being downloaded\"\r\n\techo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n\techo -e \"Build: ${BUILD_NUMBER}\"\r\n\techo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\tDOWNLOAD_URL=https:\/\/api.purpurmc.org\/v2\/${PROJECT}\/${MINECRAFT_VERSION}\/${BUILD_NUMBER}\/download\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [ -f ${SERVER_JARFILE} ]; then\r\n\tmv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\nif [ ! -f server.properties ]; then\r\n    echo -e \"Downloading MC server.properties\"\r\n    curl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft\/java\/server.properties\r\nfi",
+            "container": "ghcr.io\/pterodactyl\/installers:alpine",
+            "entrypoint": "ash"
         }
     },
     "variables": [
@@ -60,4 +63,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/spigot/README.MD b/game_eggs/minecraft/java/spigot/README.MD
index 92ed0f4f..9910d5f4 100644
--- a/game_eggs/minecraft/java/spigot/README.MD
+++ b/game_eggs/minecraft/java/spigot/README.MD
@@ -2,9 +2,11 @@
 
 A high performance Minecraft server implementation
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[Spigot Website](https://www.spigotmc.org/)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
@@ -14,6 +16,6 @@ The minecraft server requires a single port for access (default 25565) but plugi
 
 Spigot was hit with a DMCA and now requires that it be built by the user.
 
-#### This egg will build spigot for you.
+### This egg will build spigot for you
 
-You can also supply a download link to a server jar if you want. 
\ No newline at end of file
+You can also supply a download link to a server jar if you want.
diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json
index 319d3d73..ac81e7a3 100644
--- a/game_eggs/minecraft/java/spigot/egg-spigot.json
+++ b/game_eggs/minecraft/java/spigot/egg-spigot.json
@@ -4,30 +4,33 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-11T16:45:35+01:00",
+    "exported_at": "2021-12-09T13:30:38-05:00",
     "name": "Spigot",
     "author": "support@pterodactyl.io",
     "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.",
     "features": [
-        "eula"
+        "eula",
+        "java_version",
+        "pid_limit"
     ],
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-16",
-        "quay.io\/pterodactyl\/core:java-11",
-        "quay.io\/pterodactyl\/core:java"
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "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}",
-        "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\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"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt update \r\napt install -y curl wget git openssl bash bc apt-transport-https gnupg software-properties-common\r\nwget -qO - https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/api\/gpg\/key\/public | apt-key add -\r\nadd-apt-repository --yes https:\/\/adoptopenjdk.jfrog.io\/adoptopenjdk\/deb\/\r\napt update\r\nmkdir -p \/usr\/share\/man\/man1\r\nif [ \"${DL_VERSION}\" == \"latest\" ] || (( $(echo \"${DL_VERSION} >= 1.17\" | bc -l) )); then\r\n    apt install -y adoptopenjdk-16-hotspot\r\nelse\r\n    apt install -y adoptopenjdk-8-hotspot\r\nfi\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    curl -sSL -o ${SERVER_JARFILE} ${MODIFIED_DOWNLOAD}\r\nelse\r\n    mkdir -p \/srv\/\r\n    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    java -Xms${SERVER_MEMORY}M -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\nmkdir -p \/usr\/share\/man\/man1\r\n\r\nfunction install_java() {\r\n  curl -L $1 -o java.tar.gz\r\n  tar xzf java.tar.gz\r\n  export PATH=$PWD\/$2\/bin:$PATH\r\n  java -version\r\n}\r\n\r\nfunction build_spigot()\r\n{\r\n  java -Xms$1M -jar BuildTools.jar --rev ${DL_VERSION} || { echo -e \"\\n install failed! Attempted to install ${DL_VERSION} with memory of ${SERVER_MEMORY} and Java version of:\"; java -version; exit 1; }\r\n}\r\n\r\n# Detect the required Java version for building Spigot. Currently temurin only provides archives of their releases, and adoptopenjdk is deprecated. Update this when packages are released.\r\nif [[ $DL_VERSION =~ ^1\\.(18|19|20|21|22|23) || $DL_VERSION == \"latest\" ]]; then\r\n    install_java \"https:\/\/github.com\/adoptium\/temurin17-binaries\/releases\/download\/jdk-17.0.1%2B12\/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz\" jdk-17.0.1+12\r\nelif [[ $DL_VERSION =~ ^1\\.(17) ]]; then\r\n    install_java \"https:\/\/github.com\/adoptium\/temurin16-binaries\/releases\/download\/jdk-16.0.2%2B7\/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz\" jdk-16.0.2+7\r\nelse\r\n    install_java \"https:\/\/github.com\/adoptium\/temurin8-binaries\/releases\/download\/jdk8u312-b07\/OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz\" jdk8u312-b07\r\nfi\r\n\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    cd \/mnt\/server\r\n    MODIFIED_DOWNLOAD=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\n    echo -e \"Using custom provided download link ${MODIFIED_DOWNLOAD}\"\r\n    curl -L ${MODIFIED_DOWNLOAD} -o ${SERVER_JARFILE}\r\nelse\r\n    mkdir -p \/srv\/\r\n    cd \/srv\/\r\n    curl -L https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar -o BuildTools.jar\r\n\r\n    # Force the minimum Wings install container memory should someone provide less or 0 as it will break the Java build process\r\n    if [ $SERVER_MEMORY -lt 1024 ]; then\r\n        echo -e \"Do not use 0 for memory with Java applications. Defaulting to 1024MB.\\n WARNING! 1024MB might not be enough to build 1.17+ releases.\"\r\n        SERVER_MEMORY=1024\r\n        build_spigot ${SERVER_MEMORY}\r\n    else\r\n        build_spigot ${SERVER_MEMORY}\r\n    fi\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -52,12 +55,12 @@
         },
         {
             "name": "Spigot Version",
-            "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.",
+            "description": "The version of Spigot to download (using the --rev tag from https:\/\/hub.spigotmc.org\/versions). Use \"latest\" for latest.",
             "env_variable": "DL_VERSION",
             "default_value": "latest",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|between:3,7"
+            "rules": "required|string|between:3,10"
         }
     ]
 }
diff --git a/game_eggs/minecraft/java/spongeforge/README.MD b/game_eggs/minecraft/java/spongeforge/README.MD
index deedf5a3..a46e896e 100644
--- a/game_eggs/minecraft/java/spongeforge/README.MD
+++ b/game_eggs/minecraft/java/spongeforge/README.MD
@@ -1,10 +1,13 @@
 # SpongeForge
+
 SpongeForge is the implementation of the Sponge API on the Minecraft Forge platform.
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[SpongePowered Website](https://www.spongepowered.org/)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json
index 8628c2ae..a6fae67b 100644
--- a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json
+++ b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json
@@ -9,13 +9,15 @@
     "author": "parker@parkervcp.com",
     "description": "A community-driven open source Minecraft: Java Edition modding platform.",
     "features": [
-        "eula"
+        "eula",
+        "java_version",
+        "pid_limit"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "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}}",
@@ -52,4 +54,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/spongevanilla/README.MD b/game_eggs/minecraft/java/spongevanilla/README.MD
index 611b3648..33383c50 100644
--- a/game_eggs/minecraft/java/spongevanilla/README.MD
+++ b/game_eggs/minecraft/java/spongevanilla/README.MD
@@ -1,10 +1,13 @@
 # SpongeVanilla
+
 A community-driven open source Minecraft: Java Edition modding platform.
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[SpongePowered Website](https://www.spongepowered.org/)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json
index f490fd4a..c6d9449b 100644
--- a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json
+++ b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json
@@ -4,18 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:04:30+03:00",
+    "exported_at": "2021-12-09T13:30:32-05:00",
     "name": "SpongeVanilla",
     "author": "parker@parkervcp.com",
     "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.",
     "features": [
-        "eula"
+        "eula",
+        "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_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -52,4 +54,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/technic/README.md b/game_eggs/minecraft/java/technic/README.md
index b00bfacf..6b1a055e 100644
--- a/game_eggs/minecraft/java/technic/README.md
+++ b/game_eggs/minecraft/java/technic/README.md
@@ -1,6 +1,7 @@
-## Technic Eggs
+# Technic Eggs
 
 [Technic](/game_eggs/minecraft/java/technic/)
+
 * [Attack of the B-Team](/game_eggs/minecraft/java/technic/attack-of-the-bteam/)
 * [Blightfall](/game_eggs/minecraft/java/technic/blightfall/)
 * [Hexxit](/game_eggs/minecraft/java/technic/hexxit/)
diff --git a/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json b/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json
index 04db594d..e0d122d2 100644
--- a/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json
+++ b/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json
@@ -8,9 +8,15 @@
     "name": "Tekkit",
     "author": "contact@zennodes.dk",
     "description": "Tekkit is set to reignite the same sort of wonder and awe that we all received from booting up Minecraft for the first time. With the skies open, the moon ready to be colonized (by force if need be) and dimensional mysteries to be plied, with tesseracts to be networked, \u201cmeat\u201d to be processed, items to be digitized, and power suits to be manufactured, there is virtually limitless engineering projects to be assembled.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "quay.io\/pterodactyl\/core:java"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Tekkit.jar",
diff --git a/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json b/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json
index abce0996..d7f332be 100644
--- a/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json
+++ b/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json
@@ -8,9 +8,15 @@
     "name": "Tekkit Classic",
     "author": "geoffrey@remedygaming.net",
     "description": "Created by the Technic team, Tekkit Classic is a modpack for the record breaking sandbox construction game Minecraft. \r\nIt brings together some of the best mods from the Minecraft community for automating, industrializing and powering your worlds and bundles them into one easy download!",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "quay.io\/pterodactyl\/core:java"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Tekkit.jar",
diff --git a/game_eggs/minecraft/java/tuinity/README.MD b/game_eggs/minecraft/java/tuinity/README.MD
index 02345900..e57fcef3 100644
--- a/game_eggs/minecraft/java/tuinity/README.MD
+++ b/game_eggs/minecraft/java/tuinity/README.MD
@@ -2,10 +2,12 @@
 
 Fork of Paper aimed at improving server performance at high playercounts.
 
-## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+[Tuinity GitHub](https://github.com/Tuinity/Tuinity)
 
+## Server Ports
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/tuinity/egg-tuinity.json b/game_eggs/minecraft/java/tuinity/egg-tuinity.json
index a598264b..e8af6c52 100644
--- a/game_eggs/minecraft/java/tuinity/egg-tuinity.json
+++ b/game_eggs/minecraft/java/tuinity/egg-tuinity.json
@@ -4,18 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:12:43+03:00",
+    "exported_at": "2021-12-09T13:30:24-05:00",
     "name": "Tuinity",
     "author": "unknown@unknown.com",
     "description": "Fork of Paper aimed at improving server performance at high playercounts.",
     "features": [
-        "eula"
+        "eula",
+        "java_version",
+        "pid_limit"
     ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -43,4 +45,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/vanillacord/README.md b/game_eggs/minecraft/java/vanillacord/README.md
index 03b4b2c5..e8a6ad46 100644
--- a/game_eggs/minecraft/java/vanillacord/README.md
+++ b/game_eggs/minecraft/java/vanillacord/README.md
@@ -4,14 +4,14 @@ A patch for vanilla servers to work with BungeeCord's ip_forward setting.
 
 This uses [ME1312's fork](https://github.com/ME1312/VanillaCord) of VanillaCord which has been updated for modern Minecraft.
 
-## Note:
+## Notes
 
 If you've set up Spigot, Paper or some other server with BungeeCord's IP forwarding you might know that you have to set online-mode to false. Due to the way that VanillaCord works this is not necessary with this Egg, you can (and should) leave online-mode as true.
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port  | default |
 |-------|---------|
-| Game  | 25565   |
\ No newline at end of file
+| Game  | 25565   |
diff --git a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json
index ff17d0b5..8cd9f85c 100644
--- a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json
+++ b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json
@@ -4,25 +4,27 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:24:21+03:00",
+    "exported_at": "2021-12-09T13:30:15-05:00",
     "name": "VanillaCord",
     "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.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.",
     "features": [
-        "eula"
+        "eula",
+        "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_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "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}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "logs": "{}",
         "stop": "stop"
     },
     "scripts": {
@@ -52,4 +54,4 @@
             "rules": "required|string|between:3,15"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/README.md b/game_eggs/minecraft/proxy/README.md
index ff55f480..7386363c 100644
--- a/game_eggs/minecraft/proxy/README.md
+++ b/game_eggs/minecraft/proxy/README.md
@@ -7,6 +7,8 @@
   * [Velocity](/game_eggs/minecraft/proxy/java/velocity)
   * [VIAaaS](/game_eggs/minecraft/proxy/java/viaaas)
   * [Waterfall](/game_eggs/minecraft/proxy/java/waterfall)
+* [Bedrock](/game_eggs/minecraft/proxy/bedrock)
+  * [Waterdog PE](/game_eggs/minecraft/proxy/bedrock/waterdogpe)
 * [Cross Platform](/game_eggs/minecraft/proxy/cross_platform)
-    * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser)
-    * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog)
+  * [GeyserMC](/game_eggs/minecraft/proxy/cross_platform/geyser)
+  * [Waterdog](/game_eggs/minecraft/proxy/cross_platform/waterdog)
diff --git a/game_eggs/minecraft/proxy/bedrock/README.md b/game_eggs/minecraft/proxy/bedrock/README.md
new file mode 100644
index 00000000..15d8636f
--- /dev/null
+++ b/game_eggs/minecraft/proxy/bedrock/README.md
@@ -0,0 +1,6 @@
+# Mineraft Bedrock Proxies
+
+## Waterdog PE
+
+[Waterdog PE](https://github.com/WaterdogPE/WaterdogPE)
+WaterdogPE is a brand new Minecraft: Bedrock Edition proxy software developed by the developers of the old Waterdog Proxy.
diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md
new file mode 100644
index 00000000..6ba93d12
--- /dev/null
+++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/README.md
@@ -0,0 +1,9 @@
+# Waterdog PE
+
+Brand new proxy server for Minecraft: Bedrock Edition
+
+## Server Ports
+
+| Port     | default |
+|----------|---------|
+| server   | 19132   |
diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml
new file mode 100644
index 00000000..1ff35f43
--- /dev/null
+++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/config.yml
@@ -0,0 +1,70 @@
+# Waterdog Main Configuration file
+# Configure your desired network settings here.
+
+# A list of all downstream servers that are available right after starting
+# address field is formatted using ip:port
+# publicAddress is optional and can be set to the ip players can directly connect through
+servers:
+  lobby1:
+    address: 127.0.0.1:19133
+    public_address: play.myserver.com:19133
+listener:
+  # The Motd which will be displayed in the server tab of a player and returned during ping
+  motd: §bWaterdog§3PE
+  # The server priority list. If not changed by plugins, the proxy will connect the player to the first of those servers
+  priorities:
+  - lobby1
+  # The address to bind the server to
+  host: 0.0.0.0:19132
+  # The maximum amount of players that can connect to this proxy instance
+  max_players: 20
+  # Map the ip a player joined through to a specific server
+  # for example skywars.xyz.com => SkyWars-1
+  # when a player connects using skywars-xyz.com as the serverIp, he will be connected to SkyWars-1 directly
+  forced_hosts: {}
+# Case-Sensitive permission list for players (empty using {})
+permissions:
+  TobiasDev:
+  - waterdog.player.transfer
+  - waterdog.player.list
+  alemiz003:
+  - waterdog.player.transfer
+  - waterdog.player.list
+# List of permissions each player should get by default (empty using [])
+permissions_default:
+- waterdog.command.help
+- waterdog.command.info
+# Whether the debug output in the console should be enabled or not
+enable_debug: false
+# If enabled, encrypted connection between client and proxy will be created
+upstream_encryption: true
+# If enabled, only players which are authenticated with XBOX Live can join. If disabled, anyone can connect *with any name*
+online_mode: true
+# If enabled, the proxy will be able to bind to an Ipv6 Address
+enable_ipv6: false
+# If enabled, the proxy will pass information like XUID or IP to the downstream server using custom fields in the LoginPacket
+use_login_extras: true
+# Replaces username spaces with underscores if enabled
+replace_username_spaces: false
+# Whether server query should be enabled
+enable_query: true
+# If enabled, when receiving a McpeTransferPacket, the proxy will check if the target server is in the downstream list, and if yes, use the fast transfer mechanism
+prefer_fast_transfer: true
+# Fast-codec only decodes the packets required by the proxy, everything else will be passed rawly. Disabling this can create a performance hit
+use_fast_codec: true
+# If enabled, the proxy will inject all the proxy commands in the AvailableCommandsPacket, enabling autocompletion
+inject_proxy_commands: true
+# Upstream server compression ratio(proxy to client), higher = less bandwidth, more cpu, lower vice versa
+upstream_compression_level: 6
+# Upstream server compression ratio(proxy to downstream server), higher = less bandwidth, more cpu, lower vice versa
+downstream_compression_level: 2
+# Education features require small adjustments to work correctly. Enable this option if any of downstream servers support education features.
+enable_edu_features: false
+# Enable/Disable the resource pack system
+enable_packs: true
+# Whether texture packs should be enforced
+force_apply_packs: false
+# You can set maximum pack size in MB to be cached.
+pack_cache_size: 16
+# Creating threads may be in some situations expensive. Specify minimum count of idle threads per internal thread executors. Set to -1 to auto-detect by core count.
+default_idle_threads: -1
diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json
new file mode 100644
index 00000000..834cdc6c
--- /dev/null
+++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json
@@ -0,0 +1,57 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-12-09T13:32:23-05:00",
+    "name": "Waterdog PE",
+    "author": "parker@pterodactyl.io",
+    "description": "Brand new proxy server for Minecraft: Bedrock Edition",
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
+    "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_8"
+    ],
+    "file_denylist": [],
+    "startup": "java -Dterminal.ansi=true -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Started query on \"\r\n}",
+        "logs": "{}",
+        "stop": "end"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y curl\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# Adding '.jar' if it isn't part of the file name\r\nif [[ \"${SERVER_JARFILE}\" == \"*\\.jar\" ]]; then\r\n    echo -e \"adding.jar to server file name\"\r\n    SERVER_JARFILE=\"${SERVER_JARFILE}.jar\"\r\nfi\r\n\r\nif [ -z \"${WATERDOG_VERSION}\" ] || [ \"${WATERDOG_VERSION}\" == \"latest\" ]; then\r\n    echo -e \"downloading latest waterdog pe build\\n\"\r\n    curl -sSL -o ${SERVER_JARFILE} https:\/\/jenkins.waterdog.dev\/job\/Waterdog\/job\/WaterdogPE\/job\/release\/lastSuccessfulBuild\/artifact\/target\/Waterdog.jar\r\nelse \r\n    echo -e \"downloading waterdog pe build ${WATERDOG_VERSION}\\n\"\r\n    curl -sSL -o ${SERVER_JARFILE} https:\/\/jenkins.waterdog.dev\/job\/Waterdog\/job\/WaterdogPE\/job\/release\/${WATERDOG_VERSION}\/artifact\/target\/Waterdog.jar\r\nfi\r\n\r\nif [ ! -f config.yml ]; then\r\n    echo -e \"Downloading waterdog pe config.yml\"\r\n   curl -o config.yml https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/bedrock\/waterdog_pe\/config.yml\r\nelse\r\n    echo -e \"Waterfall config.yml exists. Will not pull a new file\"\r\nfi",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Waterdog PE Version",
+            "description": "The build to pull and install. (Ex. 23), or set to latest\r\n\r\nThis is the build number on https:\/\/jenkins.waterdog.dev\/",
+            "env_variable": "WATERDOG_VERSION",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Server Jar File",
+            "description": "The jar to run to",
+            "env_variable": "SERVER_JARFILE",
+            "default_value": "server.jar",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
diff --git a/game_eggs/minecraft/proxy/cross_platform/README.md b/game_eggs/minecraft/proxy/cross_platform/README.md
index 39a88343..14b20f77 100644
--- a/game_eggs/minecraft/proxy/cross_platform/README.md
+++ b/game_eggs/minecraft/proxy/cross_platform/README.md
@@ -1,13 +1,13 @@
 # Mineraft Cross Platform Proxies
 
-### GeyserMC
+## [GeyserMC](geyser)
+
 [GeyserMC](https://github.com/GeyserMC)
 
 A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition.
 
+## [Waterdog](waterdog)
 
-### Waterdog
 [Waterdog](https://github.com/WaterdogPE/Waterdog)
 
 Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others.
-
diff --git a/game_eggs/minecraft/proxy/cross_platform/geyser/README.md b/game_eggs/minecraft/proxy/cross_platform/geyser/README.md
index 10c01c34..8496e37b 100644
--- a/game_eggs/minecraft/proxy/cross_platform/geyser/README.md
+++ b/game_eggs/minecraft/proxy/cross_platform/geyser/README.md
@@ -2,5 +2,6 @@
 
 A bridge/proxy allowing you to connect to Minecraft: Java Edition servers with Minecraft: Bedrock edition.
 
-### Eggs
+## Eggs
+
 GeyserMC maintains their own eggs on their github: [GeyserMC pterodactyl eggs](https://github.com/GeyserMC/pterodactyl-stuff)
diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md b/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md
index 736f820f..eab8595f 100644
--- a/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md
+++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/README.md
@@ -1,11 +1,12 @@
 # Waterdog server
+
 Waterdog provides native support for the Minecraft Bedrock protocols along with the existing java protocols. It is capable of using the ProtocolSupport PE encapsulation protocol over TCP, or it can use the native RakNet Bedrock protocol for traditional downstream Bedrock servers such as Nukkit, Pocketmine, Bedrock Alpha Server, MiNET, and others.
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
 
 | Port     | default |
 |----------|---------|
 | Java     | 25565   |
-| Bedrock  | 19132   |
\ No newline at end of file
+| Bedrock  | 19132   |
diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
index 5bbadf7e..154d2e09 100644
--- a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
+++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:14:07+03:00",
+    "exported_at": "2021-12-09T13:32:14-05:00",
     "name": "Waterdog",
     "author": "parker@pterodactyl.io",
     "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.",
-    "features": null,
+    "features": [
+        "eula",
+        "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_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -50,4 +54,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json
index 5ca1e67e..e80e7b72 100644
--- a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json
+++ b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:31:08+03:00",
+    "exported_at": "2021-12-09T13:32:08-05:00",
     "name": "Flamecord",
     "author": "admin@softwarenoob.com",
     "description": "FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities. FlameCord aims to fix Netty related exploits to keep your server safe from attacks.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -50,4 +54,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json
index 47246c2c..9e25d5ea 100644
--- a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json
+++ b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-14T21:31:40+03:00",
+    "exported_at": "2021-12-09T13:32:03-05:00",
     "name": "Travertine",
     "author": "parker@parkervcp.com",
     "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -68,4 +72,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
index e19feef8..e1c7fb1d 100644
--- a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
+++ b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
@@ -1,13 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-06-20T11:37:02-04:00",
+    "exported_at": "2021-11-25T23:59:39+00:00",
     "name": "TyphoonLimbo",
     "author": "parker@parkervcp.com",
     "description": "Lightweight minecraft limbo server",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "features": [
+        "pid_limit"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": "`sleep 2 && .\/TyphoonLimbo`",
     "config": {
         "files": "{\r\n    \"config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"listen_address\": \":{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
@@ -23,4 +30,4 @@
         }
     },
     "variables": []
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json
index 5f9234d1..6d818780 100644
--- a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json
+++ b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json
@@ -4,17 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:14:48+03:00",
+    "exported_at": "2021-12-02T16:47:41+00:00",
     "name": "Velocity",
     "author": "parker@parkervcp.com",
     "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-15-hotspot",
-        "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_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar {{SERVER_JARFILE}}",
@@ -26,8 +29,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache curl\r\n\r\nmkdir -p \/mnt\/server\/\r\n\r\ncd \/mnt\/server\/\r\n\r\nif [ -z ${VELOCITY_VERSION} ] || [ ${VELOCITY_VERSION} == \"latest\" ]; then\r\n\tVELOCITY_VERSION=\"latest\"\r\nfi\r\n\r\necho -e \"Getting download link\"\r\nDOWNLOAD_LINK=https:\/\/versions.velocitypowered.com\/download\/${VELOCITY_VERSION}\r\n\r\necho -e \"Downloading ${DOWNLOAD_LINK}\"\r\ncurl ${DOWNLOAD_LINK} -o ${SERVER_JARFILE}\r\n\r\nif [ -f velocity.toml ]; then\r\n    echo -e \"velocity config file exists\"\r\nelse\r\n    echo -e \"downloading velocity config file.\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\nfi\r\n\r\necho -e \"install complete\"",
-            "container": "alpine:3.10",
+            "script": "#!\/bin\/ash\r\n# Velocity Proxy Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\nPROJECT=velocity\r\n\r\nif [[ -z ${VELOCITY_VERSION} ]] || [[ ${VELOCITY_VERSION} == \"latest\" ]]; then\r\n    VELOCITY_VERSION=\"latest\"\r\nfi\r\n\r\nif [[ -n \"${DOWNLOAD_LINK}\" ]]; then\r\n    echo -e \"Using supplied download url: ${DOWNLOAD_LINK}\"\r\n    DOWNLOAD_URL=$(eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g'))\r\nelse\r\n\r\n    VER_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r --arg VERSION $VELOCITY_VERSION '.versions[] | contains($VERSION)' | grep true)\r\n    LATEST_VERSION=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT} | jq -r '.versions' | jq -r '.[-1]')\r\n\r\n    if [[ \"${VER_EXISTS}\" == \"true\" ]]; then\r\n        echo -e \"Version is valid. Using version ${VELOCITY_VERSION}\"\r\n    else\r\n\r\n        echo -e \"Using the latest ${PROJECT} version\"\r\n        VELOCITY_VERSION=${LATEST_VERSION}\r\n    fi\r\n    BUILD_EXISTS=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds[] | tostring | contains($BUILD)' | grep true)\r\n    LATEST_BUILD=$(curl -s https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION} | jq -r '.builds' | jq -r '.[-1]')\r\n\r\n    if [[ \"${BUILD_EXISTS}\" == \"true\" ]]; then\r\n        echo -e \"Build is valid for version ${VELOCITY_VERSION}. Using build ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest ${PROJECT} build for version ${VELOCITY_VERSION}\"\r\n        BUILD_NUMBER=${LATEST_BUILD}\r\n    fi\r\n\r\n    JAR_NAME=${PROJECT}-${VELOCITY_VERSION}-${BUILD_NUMBER}.jar\r\n\r\n    echo \"Version being downloaded\"\r\n    echo -e \"Velocity Version: ${VELOCITY_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    echo -e \"JAR Name of Build: ${JAR_NAME}\"\r\n\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v2\/projects\/${PROJECT}\/versions\/${VELOCITY_VERSION}\/builds\/${BUILD_NUMBER}\/downloads\/${JAR_NAME}\r\nfi\r\n\r\ncd \/mnt\/server\r\necho -e \"Running curl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\"\r\n\r\nif [[ -f ${SERVER_JARFILE} ]]; then\r\n    mv ${SERVER_JARFILE} ${SERVER_JARFILE}.old\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\nif [[ -f velocity.toml ]]; then\r\n    echo -e \"velocity config file exists\"\r\nelse\r\n    echo -e \"downloading velocity config file.\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/minecraft\/proxy\/java\/velocity\/velocity.toml -o velocity.toml\r\n\r\nfi\r\necho -e \"install complete\"",
+            "container": "ghcr.io\/pterodactyl\/installers:alpine",
             "entrypoint": "ash"
         }
     },
@@ -49,6 +52,24 @@
             "user_viewable": true,
             "user_editable": false,
             "rules": "required|string|max:20"
+        },
+        {
+            "name": "Download Path",
+            "description": "A URL to use to download a server.jar rather than the ones in the install script. This is not user viewable.",
+            "env_variable": "DL_PATH",
+            "default_value": "",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "nullable|string"
+        },
+        {
+            "name": "Build Number",
+            "description": "The build number for the velocity release.\r\n\r\nLeave at latest to always get the latest version. Invalid versions will default to latest.",
+            "env_variable": "BUILD_NUMBER",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
index 19837abd..7530a027 100644
--- a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
+++ b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
@@ -4,33 +4,40 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-06-28T11:55:37-04:00",
+    "exported_at": "2021-10-16T11:26:14-03:00",
     "name": "VIAaaS",
     "author": "regulad@outlook.com",
     "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}",
     "config": {
         "files": "{\r\n    \"config\/viaaas.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"bind-address\": \"0.0.0.0\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Application started:\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Application started in \"\r\n}",
         "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
         "stop": "end"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y curl\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -Lf -o ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"",
-            "container": "debian:buster-slim",
-            "entrypoint": "bash"
+            "script": "#!\/bin\/ash\r\n# VIAaaS Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\ncd \/mnt\/server\r\nwget -O ${SERVER_JARFILE} \"https:\/\/jitpack.io\/com\/github\/ViaVersion\/VIAaaS\/master-SNAPSHOT\/VIAaaS-master-SNAPSHOT-all.jar\"",
+            "container": "ghcr.io/pterodactyl/installers:alpine",
+            "entrypoint": "ash"
         }
     },
     "variables": [
         {
-            "name": "VIAaaS Jar File",
-            "description": "The name of the jarfile to be used when downloading & running VIAaaS.",
+            "name": "VIAaaS JAR File",
+            "description": "The name of the JAR file to be used when downloading & running VIAaaS.",
             "env_variable": "SERVER_JARFILE",
             "default_value": "VIAaaS-all.jar",
             "user_viewable": true,
@@ -38,8 +45,8 @@
             "rules": "required|string"
         },
         {
-            "name": "Webserver Port",
-            "description": "The port to listen to webserver connections on.",
+            "name": "Web Server Port",
+            "description": "The port to listen to web server connections on.",
             "env_variable": "WEBSERVER_PORT",
             "default_value": "25543",
             "user_viewable": true,
@@ -47,4 +54,4 @@
             "rules": "required|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json
index 059ece4c..4d7fc579 100644
--- a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json
+++ b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json
@@ -4,16 +4,20 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:15:40+03:00",
+    "exported_at": "2021-12-09T13:31:54-05:00",
     "name": "Waterfall",
     "author": "hostmaster@waterfallgaming.net",
     "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version",
+        "pid_limit"
+    ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -68,4 +72,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minetest/minetest/README.md b/game_eggs/minetest/README.md
similarity index 100%
rename from game_eggs/minetest/minetest/README.md
rename to game_eggs/minetest/README.md
diff --git a/game_eggs/minetest/minetest/egg-minetest.json b/game_eggs/minetest/egg-minetest.json
similarity index 100%
rename from game_eggs/minetest/minetest/egg-minetest.json
rename to game_eggs/minetest/egg-minetest.json
diff --git a/game_eggs/openarena/openarena/README.md b/game_eggs/openarena/README.md
similarity index 68%
rename from game_eggs/openarena/openarena/README.md
rename to game_eggs/openarena/README.md
index 269abf84..23630319 100644
--- a/game_eggs/openarena/openarena/README.md
+++ b/game_eggs/openarena/README.md
@@ -1,12 +1,15 @@
 # OpenArena
-### From their [site](http://www.openarena.ws)
+
+## From their [site](http://www.openarena.ws)
+
 OpenArena is a community-produced deathmatch FPS based on GPL idTech3 technology.
 
 There are many game types supported including Free For All, Capture The Flag, Domination, Overload, Harvester, and more.
 
-### Server Ports  
+## Server Ports
+
 | Port    | default |
 |---------|---------|
 | Game    | 27960   |
 
-#### Mods/Plugins may require ports to be added to the server.
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/openarena/openarena/egg-open-arena.json b/game_eggs/openarena/egg-open-arena.json
similarity index 100%
rename from game_eggs/openarena/openarena/egg-open-arena.json
rename to game_eggs/openarena/egg-open-arena.json
diff --git a/game_eggs/openra/README.md b/game_eggs/openra/README.md
index b587c97b..a87ceab0 100644
--- a/game_eggs/openra/README.md
+++ b/game_eggs/openra/README.md
@@ -1,5 +1,5 @@
 # OpenRA Servers
 
-OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. 
-We have developed a flexible open source game engine (the OpenRA engine) that provides 
-a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).
\ No newline at end of file
+OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games.
+We have developed a flexible open source game engine (the OpenRA engine) that provides
+a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).
diff --git a/game_eggs/openra/openra_dune2000/README.md b/game_eggs/openra/openra_dune2000/README.md
index a89ee18e..fcf95648 100644
--- a/game_eggs/openra/openra_dune2000/README.md
+++ b/game_eggs/openra/openra_dune2000/README.md
@@ -1,20 +1,21 @@
 # OpenRA Dune2000
 
-#### The classic command & conquer Server
+## The classic command & conquer Server
 
+## from the developers
 
-#### from the developers
 OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. We have developed a flexible open source game engine (the OpenRA engine) that provides a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).
 
 This means that OpenRA is not restricted by the technical limitations of the original closed-source games: it includes native support for modern operating systems and screen resolutions (including Windows 10, macOS, and most Linux distros) without relying on emulation or binary hacks, and features integrated online multiplayer.
 
 Make sure to checkout their [Home Page](https://openra.net).
 
-### Server Ports
-OpenRA requires a single port  
+## Server Ports
+
+OpenRA requires a single port
 
 | Port    | default |
 |---------|---------|
 | Game    | 5500    |
 
-#### Mods/Plugins may require ports to be added to the server.
\ No newline at end of file
+## Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/openra/openra_red_alert/README.md b/game_eggs/openra/openra_red_alert/README.md
index 1ad6002d..c1ea47a1 100644
--- a/game_eggs/openra/openra_red_alert/README.md
+++ b/game_eggs/openra/openra_red_alert/README.md
@@ -1,20 +1,21 @@
 # OpenRA
 
-#### The classic command & conquer Server
+## The classic command & conquer Server
 
+## from the developers
 
-#### from the developers
 OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. We have developed a flexible open source game engine (the OpenRA engine) that provides a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).
 
 This means that OpenRA is not restricted by the technical limitations of the original closed-source games: it includes native support for modern operating systems and screen resolutions (including Windows 10, macOS, and most Linux distros) without relying on emulation or binary hacks, and features integrated online multiplayer.
 
 Make sure to checkout their [Home Page](https://openra.net).
 
-### Server Ports
-OpenRA requires a single port  
+## Server Ports
+
+OpenRA requires a single port
 
 | Port    | default |
 |---------|---------|
 | Game    | 5500    |
 
-#### Mods/Plugins may require ports to be added to the server.
\ No newline at end of file
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/openra/openra_tiberian_dawn/README.md b/game_eggs/openra/openra_tiberian_dawn/README.md
index 2ad7281c..98db384b 100644
--- a/game_eggs/openra/openra_tiberian_dawn/README.md
+++ b/game_eggs/openra/openra_tiberian_dawn/README.md
@@ -1,20 +1,21 @@
 # OpenRA Tiberian Dawn
 
-#### The classic command & conquer Server
+## The classic command & conquer Server
 
+## from the developers
 
-#### from the developers
 OpenRA is a project that recreates and modernizes the classic Command & Conquer real time strategy games. We have developed a flexible open source game engine (the OpenRA engine) that provides a common platform for rebuilding and reimagining classic 2D and 2.5D RTS games (the OpenRA mods).
 
 This means that OpenRA is not restricted by the technical limitations of the original closed-source games: it includes native support for modern operating systems and screen resolutions (including Windows 10, macOS, and most Linux distros) without relying on emulation or binary hacks, and features integrated online multiplayer.
 
 Make sure to checkout their [Home Page](https://openra.net).
 
-### Server Ports
-OpenRA requires a single port  
+## Server Ports
+
+OpenRA requires a single port
 
 | Port    | default |
 |---------|---------|
 | Game    | 5500    |
 
-#### Mods/Plugins may require ports to be added to the server.
\ No newline at end of file
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/rdr/README.md b/game_eggs/rdr/README.md
index abade62b..50e47255 100644
--- a/game_eggs/rdr/README.md
+++ b/game_eggs/rdr/README.md
@@ -1,6 +1,6 @@
-# Read Dead Redemption 
+# Read Dead Redemption
 
 ## RedM
 
-[RedM](https://redm.gg/)  
-RedM, for Red Dead Redemption 2 on PC. Launching now, based on the CitizenFX framework and Cfx.re technology.
\ No newline at end of file
+[RedM](https://redm.gg/)
+RedM, for Red Dead Redemption 2 on PC. Launching now, based on the CitizenFX framework and Cfx.re technology.
diff --git a/game_eggs/rdr/redm/README.md b/game_eggs/rdr/redm/README.md
index 469e3f07..8900e0bd 100644
--- a/game_eggs/rdr/redm/README.md
+++ b/game_eggs/rdr/redm/README.md
@@ -1,16 +1,19 @@
 # Red M
 
-### From the [RedM](https://redm.gg/) Site
+## From the [RedM](https://redm.gg/) Site
+
 RedM, for Red Dead Redemption 2 on PC. Launching now, based on the CitizenFX framework and Cfx.re technology.
 
-### Install notes
+## Install notes
+
 - Only installs latest version versions are not selectable.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
 |---------|---------|
 | Game    | 30120   |
 | ServerListing  | 30110   |
-| cfx join links  | 30130   |
\ No newline at end of file
+| cfx join links  | 30130   |
diff --git a/game_eggs/rdr/redm/egg-red-m.json b/game_eggs/rdr/redm/egg-red-m.json
index 9bfeef23..95a784b3 100644
--- a/game_eggs/rdr/redm/egg-red-m.json
+++ b/game_eggs/rdr/redm/egg-red-m.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:16:45+03:00",
+    "exported_at": "2022-01-22T05:43:25-05:00",
     "name": "RedM",
     "author": "parker@parkervcp.com",
     "description": "A new RedM egg for the latest builds due to recent changes in RedM",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": "$(pwd)\/alpine\/opt\/cfx-server\/ld-musl-x86_64.so.1 --library-path \"$(pwd)\/alpine\/usr\/lib\/v8\/:$(pwd)\/alpine\/lib\/:$(pwd)\/alpine\/usr\/lib\/\" -- $(pwd)\/alpine\/opt\/cfx-server\/FXServer +set citizen_dir $(pwd)\/alpine\/opt\/cfx-server\/citizen\/ +set sv_licenseKey {{CFX_LICENSE}} +set steam_webApiKey {{STEAM_WEBAPIKEY}} +set sv_maxplayers {{MAX_PLAYERS}} +exec server.cfg +set gamename rdr3",
@@ -22,7 +22,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/ \r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\n\r\nif [ \"${CFX_VERSION}\" == \"latest\" ] || [ -z ${CFX_VERSION} ] ; then\r\n    LATEST_RECOMMENDED=$(echo -e \"${RELEASE_PAGE}\" | grep \"LATEST RECOMMENDED\" -B1 | grep -Eo 'href=\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1')\r\n    DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${LATEST_RECOMMENDED})\r\nelse\r\n    VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo 'href=\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n    if [ \"${VERSION_LINK}\" == \"\" ]; then\r\n        echo -e \"defaulting to latest as the version requested was invalid.\"\r\n    else\r\n        DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n    fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else\r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n    tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n    unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n    tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n    echo -e \"unknown filetype. Exeting\"\r\n    exit 2 \r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n    echo \"server config file exists\"\r\nelse\r\n    echo \"Downloading default fivem config\"\r\n    curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >> server.cfg\r\nfi\r\n\r\necho \"install complete\"",
+            "script": "#!\/bin\/ash\r\n# CFx Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add openssl tar xz curl wget git file --no-cache jq\r\n\r\nmkdir -p \/mnt\/server\/resources \/mnt\/server\/logs\/\r\n\r\ncd \/mnt\/server\r\n\r\necho \"updating citizenfx resource files\"\r\ngit clone https:\/\/github.com\/citizenfx\/cfx-server-data.git \/tmp\r\ncp -Rf \/tmp\/resources\/* resources\/\r\n\r\nRELEASE_PAGE=$(curl -sSL https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/)\r\nCHANGELOGS_PAGE=$(curl -sSL https:\/\/changelogs-live.fivem.net\/api\/changelog\/versions\/linux\/server)\r\n\r\nif [[ \"${CFX_VERSION}\" == \"latest\" ]] || [[ -z ${CFX_VERSION} ]]; then\r\n  DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\nelse\r\n  VERSION_LINK=$(echo -e \"${RELEASE_PAGE}\" | grep -Eo '\".*\/*.tar.xz\"' | grep -Eo '\".*\"' | sed 's\/\\\"\/\/g' | sed 's\/\\.\\\/\/\/1' | grep ${CFX_VERSION})\r\n  if [[ \"${VERSION_LINK}\" == \"\" ]]; then\r\n    echo -e \"defaulting to latest as the version requested was invalid.\"\r\n    DOWNLOAD_LINK=$(echo $CHANGELOGS_PAGE | jq -r '.latest_download')\r\n  else\r\n    DOWNLOAD_LINK=$(echo https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/${VERSION_LINK})\r\n  fi\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then\r\n  if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n    echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n    DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n  else\r\n    echo -e \"link is invalid closing out\"\r\n    exit 2\r\n  fi\r\nfi\r\n\r\necho -e \"Running curl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\"\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\necho \"Extracting fivem files\"\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n  tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n  unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n  tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n  echo -e \"unknown filetype. Exiting\"\r\n  exit 2\r\nfi\r\n\r\nrm -rf ${DOWNLOAD_LINK##*\/} run.sh\r\n\r\nif [ -e server.cfg ]; then\r\n  echo \"server config file exists\"\r\nelse\r\n  echo \"Downloading default fivem config\"\r\n  curl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/gta\/fivem\/server.cfg >>server.cfg\r\nfi\r\n\r\necho \"install complete\"",
             "container": "alpine:3.10",
             "entrypoint": "ash"
         }
@@ -66,7 +66,7 @@
         },
         {
             "name": "CFX version",
-            "description": "The CFX Server version that is to be installed.\r\n\r\nan example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/",
+            "description": "The CFX Server version that is to be installed. Invalid versions will default to latest.\r\n\r\nan example is `1383-e5ea040353ce1b8bc86e37982bf5d888938e3096`\r\n\r\nYou can the latest version from here - https:\/\/runtime.fivem.net\/artifacts\/fivem\/build_proot_linux\/master\/",
             "env_variable": "CFX_VERSION",
             "default_value": "latest",
             "user_viewable": true,
@@ -83,4 +83,4 @@
             "rules": "string|nullable"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/starmade/starmade/README.md b/game_eggs/starmade/README.md
similarity index 74%
rename from game_eggs/starmade/starmade/README.md
rename to game_eggs/starmade/README.md
index 33583884..4a7bdc61 100644
--- a/game_eggs/starmade/starmade/README.md
+++ b/game_eggs/starmade/README.md
@@ -1,8 +1,11 @@
 # Starmade Server
-### From their [Homepage](https://starmadedock.net/) - [Guide](https://www.star-made.org/help/setting_up_a_server)
+
+## From their [Homepage](https://starmadedock.net/) - [Guide](https://www.star-made.org/help/setting_up_a_server)
+
 The ultimate space sandbox. Participate in epic fleet battles, form alliances, strive to dominate entire galaxies and harness the universe’s resources for your industrious empire or the destruction of others. Customise your experience, the universe is yours!
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server
 
 | Port    | default |
diff --git a/game_eggs/starmade/starmade/egg-starmade.json b/game_eggs/starmade/egg-starmade.json
similarity index 100%
rename from game_eggs/starmade/starmade/egg-starmade.json
rename to game_eggs/starmade/egg-starmade.json
diff --git a/game_eggs/steamcmd_servers/7_days_to_die/README.md b/game_eggs/steamcmd_servers/7_days_to_die/README.md
index b046957b..890b3d11 100644
--- a/game_eggs/steamcmd_servers/7_days_to_die/README.md
+++ b/game_eggs/steamcmd_servers/7_days_to_die/README.md
@@ -1,16 +1,14 @@
 # 7 Days to Die
-Steam Description  
+
+Steam Description
 Set in a brutally unforgiving post-apocalyptic world overrun by the undead, 7 Days to Die is an open-world game that is a unique combination of first person shooter, survival horror, tower defense, and role-playing games. It presents combat, crafting, looting, mining, exploration, and character growth, in a way that has seen a rapturous response from fans worldwide. Play the definitive zombie survival sandbox RPG that came first. Navezgane awaits!
 
-### Server Ports
-7 Days to Die requires up to 6 ports
+## Server Ports
 
-game ports (default 26900-26902)
-remote control (default 8080, 8081)
-allocs webmap (default 8082)
+7 Days to Die requires up to 6 ports
 
 | Port    | default       |
 |---------|---------------|
 | Game    | 26900 - 26902 |
 | RCON    | 8080 - 8081   |
-| webmap  | 8082          |
\ No newline at end of file
+| webmap  | 8082          |
diff --git a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json
index 858e871d..81309ccc 100644
--- a/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json
+++ b/game_eggs/steamcmd_servers/7_days_to_die/egg-7-days-to-die.json
@@ -1,24 +1,31 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-11-06T20:06:59-05:00",
+    "exported_at": "2021-12-22T12:58:29+01:00",
     "name": "7 Days To Die",
     "author": "kristoffer.norman@bahnhof.se",
     "description": "7 days to die server",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
-    "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=8081 -logfile logs\/latest.log & echo -e \"Checing on telnet connection\" && until nc -z -v -w5 127.0.0.1 8081; do echo \"Waiting for telnet connection...\"; sleep 5; done && telnet -E 127.0.0.1 8081",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": ".\/7DaysToDieServer.x86_64 -configfile=serverconfig.xml -quit -batchmode -nographics -dedicated -ServerPort=${SERVER_PORT} -ServerMaxPlayerCount=${MAX_PLAYERS} -GameDifficulty=${GAME_DIFFICULTY} -ControlPanelEnabled=false -TelnetEnabled=true -TelnetPort=${TELNET_PORT} -TelnetPassword=${PASSWORD} -logfile logs\/latest.log & echo -e \"Checking on telnet connection\" && until nc -z -v -w5 127.0.0.1 ${TELNET_PORT}; do echo \"Waiting for telnet connection...\"; sleep 5; done && $( [[ -z ${PASSWORD} ]] && printf %s \"telnet -E 127.0.0.1 ${TELNET_PORT}\" || printf %s \"rcon -t telnet -a 127.0.0.1:${TELNET_PORT} -p {{PASSWORD}}\" )",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"Connected with 7DTD server\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Connected with 7DTD server\"\r\n}",
+        "logs": "{}",
         "stop": "shutdown"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# 7 days to die Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 294420 +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
-            "container": "ubuntu:18.04",
+            "script": "#!\/bin\/bash\r\n# 7 days to die Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_FLAGS} validate +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\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -28,8 +35,8 @@
             "description": "Maximum Concurrent Players",
             "env_variable": "MAX_PLAYERS",
             "default_value": "8",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -37,8 +44,8 @@
             "description": "0 - 5, 0=easiest, 5=hardest",
             "env_variable": "GAME_DIFFICULTY",
             "default_value": "2",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer|between:0,5"
         },
         {
@@ -46,8 +53,8 @@
             "description": "This is the app id for 7dtd please no step on snek.",
             "env_variable": "SRCDS_APPID",
             "default_value": "294420",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -55,8 +62,8 @@
             "description": "This is to auto update the server on start.\r\n\r\nOptions are 0 or 1\r\nDefault is 1",
             "env_variable": "AUTO_UPDATE",
             "default_value": "1",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|boolean"
         },
         {
@@ -64,9 +71,36 @@
             "description": "This is really annoying that more games are doing this.",
             "env_variable": "LD_LIBRARY_PATH",
             "default_value": ".",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Beta Branch",
+            "description": "Installs beta branch if specified. For example, latest_experimental would install the latest experimental branch release. Requires a reinstall to switch branches properly.",
+            "env_variable": "SRCDS_BETAID",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:20"
+        },
+        {
+            "name": "Telnet Password",
+            "description": "Telnet listens on a local interface by default without a password. However, you can specify a password if  you wish to expose telnet.",
+            "env_variable": "PASSWORD",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:30"
+        },
+        {
+            "name": "Telnet Port",
+            "description": "",
+            "env_variable": "TELNET_PORT",
+            "default_value": "8081",
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/README.md b/game_eggs/steamcmd_servers/README.md
index c7098796..448c6b72 100644
--- a/game_eggs/steamcmd_servers/README.md
+++ b/game_eggs/steamcmd_servers/README.md
@@ -3,127 +3,186 @@
 This is a collection of servers that use SteamCMD to install.
 
 ## 7 Days To Die
+
 [7 Days To Die](7_days_to_die)
 
 ## ARK: Survival Evolved
+
 [ARK: Survival Evolved](ark_survival_evolved)
 
 ## Arma
-  * [Arma 3](arma/arma3)
+
+[Arma 3](arma/arma3)
 
 ## Assetto Corsa
+
 [Assetto Corsa](assetto_corsa)
 
 ## Avorion
+
 [Avorion](avorion)
 
 ## Barotrauma
+
 [Barotrauma](barotrauma)
 
 ## Citadel: Forged with Fire
+
 [citadel](citadel)
 
 ## Conan Exiles
+
 [Conan Exiles](conan_exiles)
 
+## Craftopia
+[Craftopia](craftopia)
+
+## CryoFall
+
+[Cryofall](cryofall)
+
 ## Don't Starve Together
+
 [Don't Starve Together](dont_starve)
 
 ## ECO
+
 [ECO](eco)
 
 ## HLDS Server
+
 [HLDS Server](hlds_server)
 
 ## Holdfast: Nations At War
+
 [Holdfast: Nations At War](holdfast)
 
 ## Hurtworld
+
 [Hurtworld](hurtworld)
 
 ## Insurgency: Sandstorm
+
 [Insurgency: Sandstorm](insurgency_sandstorm)
 
 ## Killing Floor 2
+
 [Killing Floor 2](killing_floor_2)
 
+## Left 4 Dead
+[Left 4 Dead](left4dead)
+
+## Left 4 Dead 2
+[Left 4 Dead](left4dead_2)
+
 ## Modiverse
+
 [Modiverse](modiverse)
 
 ## Mordhau
+
 [Mordhau](mordhau)
 
 ## Onset
+
 [Onset](onset)
 
 ## Pavlov VR
+
 [Pavlov VR](pavlov_vr)
 
 ## PixARK
+
 [PixARK](pixark)
 
 ## Post Scriptum
+
 [Post Scriptum](post_scriptum)
 
 ## Project Zomboid
+
 [Project Zomboid](project_zomboid)
 
 ## Quake Live
+
 [Quake Live](quake_live)
 
 ## Rising World
+
 [Rising World](rising_world)
 
 ## Risk of Rain 2
+
 [Risk Of Rain 2](risk_of_rain_2)
 
 ## Rust
+
 * [Rust](rust)
   * [Autowipe](rust/rust_autowipe)
   * [Staging](rust/rust_staging)
 
+## Satisfactory
+
+[Satisfactory](satisfactory)
+
 ## SCP: Secret Laboratory
+
 * [SCP: Secret Laboratory](scpsl)
   * [dedicated](scpsl/dedicated)
+  * [exiled](scpsl/exiled)
   * [multiadmin](scpsl/multiadmin)
 
 ## Soldat
+
 [Soldat](soldat)
 
 ## Space Engineers
+
 [Space Engineers](space_engineers)
 
 ## Squad
+
 [Squad](squad)
 
 ## Starbound
+
 [Starbound](starbound)
 
 ## Stationeers
+
 [Stationeers](stationeers)
 
 ## Stormworks: Build and Rescue
+
 [Stormworks: Build and Rescue](stormworks)
 
 ## Subnautica: Nitrox Mod
+
 [Subnautica: Nitrox Mod](subnautica_nitrox_mod)
 
 ## Sven coop
+
 [Sven Co-op](svencoop)
 
 ## Team Fortress 2 Classic
+
 [Team Fortress 2 Classic](team_fortress_2_classic)
 
 ## The Forest
+
 [The Forest](the_forest)
 
 ## Tower Unite
+
 [Tower Unite](tower_unite)
 
 ## Unturned
+
 [Unturned](unturned)
 
 ## Valheim
+
 [Valheim](valheim)
-  * [Valheim Vanilla](valheim/valheim_vanilla)
-  * [Valheim Plus Mod](valheim/valheim_plus)
+
+* [Valheim Vanilla](valheim/valheim_vanilla)
+* [Valheim Plus Mod](valheim/valheim_plus)
diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/README.md b/game_eggs/steamcmd_servers/ark_survival_evolved/README.md
index f21c26fb..3df719db 100644
--- a/game_eggs/steamcmd_servers/ark_survival_evolved/README.md
+++ b/game_eggs/steamcmd_servers/ark_survival_evolved/README.md
@@ -9,7 +9,7 @@ As a man or woman stranded naked, freezing and starving on the shores of a myste
 
 This server requires about 4096M to run with no players on a default map. Although it is recommended to run 6144M by the ARK creators, specific DLC maps will increase this requirement, such as Genesis 2 requiring over 13,440M to start.
 
-See the following - https://ark.gamepedia.com/Dedicated_Server_Setup#Hardware
+See the following - <https://ark.gamepedia.com/Dedicated_Server_Setup#Hardware>
 
 ### RCON
 
diff --git a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json
index f0dfa7af..51c0c553 100644
--- a/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json
+++ b/game_eggs/steamcmd_servers/ark_survival_evolved/egg-ark--survival-evolved.json
@@ -4,13 +4,15 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-27T14:22:41+03:00",
+    "exported_at": "2021-11-26T13:48:52+01: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"
+        "ghcr.io\/parkervcp\/games:source"
     ],
     "file_denylist": [],
     "startup": "rmv() { echo -e \"stopping server\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c saveworld && rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD} -c DoExit; }; trap rmv 15; cd ShooterGame\/Binaries\/Linux && .\/ShooterGameServer {{SERVER_MAP}}?listen?SessionName=\"{{SESSION_NAME}}\"?ServerPassword={{ARK_PASSWORD}}?ServerAdminPassword={{ARK_ADMIN_PASSWORD}}?Port={{SERVER_PORT}}?RCONPort={{RCON_PORT}}?QueryPort={{QUERY_PORT}}?RCONEnabled=True$( [ \"$BATTLE_EYE\" == \"1\" ] || printf %s ' -NoBattlEye' ) -server {{ARGS}} -log & until echo \"waiting for rcon connection...\"; rcon -t rcon -a 127.0.0.1:${RCON_PORT} -p ${ARK_ADMIN_PASSWORD}; do sleep 5; done",
@@ -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\napt -y update\r\napt -y --no-install-recommends --no-install-suggests install curl lib32gcc-s1 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": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -119,4 +121,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/arma/README.md b/game_eggs/steamcmd_servers/arma/README.md
index ddc7aa90..9e667cb5 100644
--- a/game_eggs/steamcmd_servers/arma/README.md
+++ b/game_eggs/steamcmd_servers/arma/README.md
@@ -3,4 +3,5 @@
 ARMA is a series of first-person tactical military shooters, originally released for Microsoft Windows. It features large elements of realism and simulation; a blend of large-scale military conflict spread across large areas alongside the more close quartered battles.
 
 ## Arma Titles
+
 * [Arma 3](arma3)
diff --git a/game_eggs/steamcmd_servers/arma/arma3/README.md b/game_eggs/steamcmd_servers/arma/arma3/README.md
index 73aa486c..c06131db 100644
--- a/game_eggs/steamcmd_servers/arma/arma3/README.md
+++ b/game_eggs/steamcmd_servers/arma/arma3/README.md
@@ -1,7 +1,10 @@
 # Arma 3
+
 ***Updating your Egg? Please see [How to Update Egg](#how-to-update-egg) to avoid any issues!***
 ___
-### Authors / Contributors
+
+## Authors / Contributors
+
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 <table>
@@ -37,11 +40,15 @@ ___
 <!-- prettier-ignore-end -->
 
 ___
+
 ### Game Description
+
 From Bohemia Interactive's [Website](https://arma3.com/):
 > Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC’s premier military game. Authentic, diverse, open - Arma 3 sends you to war.
 ___
+
 ### Egg Capabilities
+
 - Configurable to run 32 or 64-bit versions of the server
 - Max Players is configurable and able to be host enforced (\*see [Recommended Egg Modifications](#recommended-egg-modifications))
 - Able to download server updates on startup
@@ -55,12 +62,18 @@ ___
 - Additional [Arma 3 startup parameters](https://community.bistudio.com/wiki/Arma_3_Startup_Parameters) can be added to fine-tune performance
 - Configurable to run up to 5 Headless Clients in parallel with the main server (may require additional performance overhead)
 - [WHMCS](https://www.whmcs.com/) compatible (\*see [Recommended Egg Modifications](#recommended-egg-modifications))
+
 ___
+
 ### Installation Requirements
+
 - A valid, **real** Steam account, with **Steam Guard turned off**, is required to install the server (default "anonymous" login cannot be used). For security reasons it is [recommended by Valve](https://developer.valvesoftware.com/wiki/SteamCMD#With_a_Steam_account) that you create a new Steam account just for your dedicated servers. This account *does not* need to own Arma 3.
 - For automatic Steam Workshop mod downloading to work, the Steam account *does* need to own Arma 3. However, this is optional functionality, and mods can be manually uploaded to the server if desired. Hosts may feel free to change the "Disable Mod Downloads/Updates" variable to `1` if they would not like to offer it's functionality to clients.
+
 ___
+
 ### Server Ports
+
 Default server ports are listed below, but the Main port can be any port. There are three more ports after the Main port are relative to the Main port (For example: The BattlEye port is always 4 ports higher than the main port). **All four ports are required for normal server behavior.** It is [recommended](https://community.bistudio.com/wiki/Arma_3:_Dedicated_Server#Port_Forwarding) that each server be 100 ports separate from each other.
 
 | Port | Default |
@@ -70,25 +83,41 @@ Default server ports are listed below, but the Main port can be any port. There
 | Steam Port (+2) | 2304 |
 | BattleEye (+4) | 2306 |
 
-#### Mods/Plugins may require ports to be added to the server.
+#### Mods/Plugins may require ports to be added to the server
+
 ___
+
 ### CPU Usage Information
+
 ARMA 3 is mainly CPU intensive. Contrary to popular belief, the server binary *can* run on multiple cores/threads. However, it's ability to manage asynchronous tasks and hyperthread is *very* limited, meaning additional cores/threads reach diminishing returns very quickly. In addition, it's ability to utilize all of the CPU allotted to it for AI processing seems to be limited as well. Therefore, a Headless Client ***and*** a properly written mission file are highly recommended if large amounts of AI units will be used.
+
 ___
+
 ### Minimum RAM Requirement
+
 This server requires about 2048 MB of RAM to run properly. If used, every Headless Client uses an additional 2048 MB of RAM as well.
 ___
+
 ### Minimum Disk Requirement
+
 This server requires just under 10 GB of disk space to safely run properly with no mods. However, mods can easily increase disk usage to 50 GB or more, depending on how many are downloaded.
 ___
+
 ### Recommended Egg Modifications
+
 The following are highly recommended variable modifications you can make to the egg after importing it to your panel. While viewing this egg, simply go to the "Variables" tab of the egg editor to make these changes.
+
 #### Default Steam Username & Password
+
 - To make deploying servers easy (**or if you are using WHMCS**), it is recommended to edit the default values of "Steam Username" and "Steam Password" to your Steam account dedicated for hosting. This will make all newly installed servers use these credentials. **DO NOT** make these fields visible to the end user so that they can use their own Steam accounts; the panel will save their Steam credentials in **plain text**, which is a BIG NO NO for security and privacy.
+
 #### Restrict Max Players
+
 - If you would like to restrict the maximum number of players that can join your client's server, you can change the permissions of the "Max Players" variable so that clients can only view this value (and not edit it). It's default value can also be changed, or the value can be changed on a server-by-server basis as desired.
 ___
+
 ### How to Update Egg
+
 If you already have an Arma 3 egg installed on your panel, there are a couple things to consider before updating to this egg:
 - The Startup Command has changed, but Pterodactyl currently does not update this across all your existing servers. Servers will still boot with their old Startup Command, but the new HTML Modlist feature will not work, and depreciated variables for config files will be used. Servers will have to be manually updated to the new Startup Command via the Startup tab.
 - Startup Variables have been completely rehauled. While most important existing variables have retained their Environment Variable names, a lot of their titles and order have been adjusted. Simply updating your existing egg with this egg may lead to Startup Variables being terribly out of order and cluttered. Therefore, the following steps are recommended to avoid this:
diff --git a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json
index f2d68d29..9c72ea16 100644
--- a/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json
+++ b/game_eggs/steamcmd_servers/arma/arma3/egg-arma3.json
@@ -1,16 +1,18 @@
 {
-    "_comment": "Pterodactyl Arma 3 Egg ~ David Wolfe (Red-Thirten) ~ 2021-07-11",
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
         "version": "PTDL_v1",
         "update_url": null
     },
+    "exported_at": "2021-11-26T13:51:11+01:00",
     "name": "Arma 3",
     "author": "rehlmgaming@gmail.com",
     "description": "Experience true combat gameplay in a massive military sandbox. Deploying a wide variety of single- and multiplayer content, over 20 vehicles and 40 weapons, and limitless opportunities for content creation, this is the PC's premier military game. Authentic, diverse, open - Arma 3 sends you to war.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
-        "ghcr.io\/parkervcp\/games:arma3",
-        "quay.io\/parkervcp\/pterodactyl-images:game_arma3"
+        "ghcr.io\/parkervcp\/games:arma3"
     ],
     "file_denylist": [],
     "startup": ".\/{{SERVER_BINARY}} -ip=0.0.0.0 -port={{SERVER_PORT}} -profiles=.\/serverprofile -bepath=.\/battleye -cfg=basic.cfg -config=server.cfg -mod=\\\"{{CLIENT_MODS}}\\\" -serverMod=\\\"{{SERVERMODS}}\\\" {{STARTUP_PARAMS}}",
@@ -22,8 +24,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma 3 Egg - egg-arma3.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2021\/07\/11\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \"\/mnt\/server\/steamcmd\" \"\/mnt\/server\/steamapps\"\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 server using SteamCMD\r\n.\/steamcmd.sh \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +force_install_dir \/mnt\/server +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +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\r\n\r\n# Arma 3 setup\r\ncd \/mnt\/server\/\r\n\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\n[[ -f basic.cfg ]] || curl -sSLO ${BASIC_URL}\r\n[[ -f server.cfg ]] || curl -sSLO ${BASIC_URL%\/*}\/server.cfg\r\nchmod 755 basic.cfg server.cfg",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl Arma 3 Egg - egg-arma3.json\r\n## Author: David Wolfe (Red-Thirten)\r\n## Date: 2021\/07\/11\r\n## License: MIT License\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n# Download and install SteamCMD\r\ncd \/tmp\r\nmkdir -p \"\/mnt\/server\/steamcmd\" \"\/mnt\/server\/steamapps\"\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 server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server \"+login \\\"${STEAM_USER}\\\" \\\"${STEAM_PASS}\\\"\" +app_update ${STEAMCMD_APPID} ${STEAMCMD_EXTRA_FLAGS} validate +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\r\n\r\n# Arma 3 setup\r\ncd \/mnt\/server\/\r\n\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\n[[ -f basic.cfg ]] || curl -sSLO ${BASIC_URL}\r\n[[ -f server.cfg ]] || curl -sSLO ${BASIC_URL%\/*}\/server.cfg\r\nchmod 755 basic.cfg server.cfg",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
diff --git a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json
index 84b8d2b6..905a4c08 100644
--- a/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json
+++ b/game_eggs/steamcmd_servers/assetto_corsa/egg-assetto-corsa.json
@@ -1,25 +1,31 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-14T03:20:46+02:00",
+    "exported_at": "2021-12-07T16:03:51+00:00",
     "name": "Assetto Corsa",
     "author": "admin@softwarenoob.com",
     "description": "Assetto Corsa (Italian for \"Race Setup\") is a sim racing video game developed by the Italian video game developer Kunos Simulazioni. It is designed with an emphasis on a realistic racing experience with support for extensive customization and moddability",
-    "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/acServer",
     "config": {
         "files": "{\r\n    \"cfg\/server_cfg.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"NAME\": \"NAME={{server.build.env.HOSTNAME}}\",\r\n            \"PASSWORD\": \"PASSWORD={{server.build.env.PASSWORD}}\",\r\n            \"ADMIN_PASSWORD\": \"ADMIN_PASSWORD={{server.build.env.ADM_PASSWORD}}\",\r\n            \"UDP_PORT\": \"UDP_PORT={{server.build.default.port}}\",\r\n            \"TCP_PORT\": \"TCP_PORT={{server.build.default.port}}\",\r\n            \"HTTP_PORT\": \"HTTP_PORT={{server.build.env.HTTP_PORT}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Server started\"\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
+        "logs": "{}",
+        "stop": "^^C"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\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\nelse\r\n    echo -e \"Downloading the game as Steam user ${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\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} +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update 302550 ${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\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n    echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n    echo -e \"Steam account must have the dedicated server in his library in order to install and host the game\\n\"\r\n    echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} ${INSTALL_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\nif [ \"${STEAM_USER}\" == \"anonymous\" ]; then\r\n    echo -e \"ERROR - STEAM USER NOT SET\\n\"\r\n    echo -e \"Steam account must have the dedicated server in library to install and host the game\\n\"\r\n    echo -e \"You must configure Steam account in the server startup variables, after that reinstall the server\\n\"\r\nfi",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -31,7 +37,7 @@
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "nullable|string"
+            "rules": "required|string"
         },
         {
             "name": "Steam Password",
@@ -40,11 +46,11 @@
             "default_value": "",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "nullable|string"
+            "rules": "required|string"
         },
         {
             "name": "Steam Auth Code",
-            "description": "Steam Auth Code required if the Steam Account is using Steam Auth",
+            "description": "Steam Auth Code required if the Steam Account is using Steam Auth. Slow installs will cause the code to expire before it can be used.",
             "env_variable": "STEAM_AUTH",
             "default_value": "",
             "user_viewable": true,
@@ -86,6 +92,33 @@
             "user_viewable": false,
             "user_editable": false,
             "rules": "required|string|max:20"
+        },
+        {
+            "name": "SRCDS_APPID",
+            "description": "",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "302550",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Auto Update",
+            "description": "autoupdate Server on start or restart. 1 = on; 0 = off",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:1"
+        },
+        {
+            "name": "Windows param",
+            "description": "Required to always install and update the correct version of the game.",
+            "env_variable": "WINDOWS_INSTALL",
+            "default_value": "1",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/avorion/egg-avorion.json b/game_eggs/steamcmd_servers/avorion/egg-avorion.json
index 1df72421..4c0206bb 100644
--- a/game_eggs/steamcmd_servers/avorion/egg-avorion.json
+++ b/game_eggs/steamcmd_servers/avorion/egg-avorion.json
@@ -1,14 +1,21 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-10-04T11:49:22-07:00",
+    "exported_at": "2021-11-26T14:35:45+01:00",
     "name": "Avorion",
     "author": "iamkubi@gmail.com",
     "description": "A procedural co-op space sandbox where players can build their own space ships out of dynamically scalable blocks. Fight epic space battles, explore, mine, trade, wage wars and build your own empire to save your galaxy from being torn apart by an unknown enemy.",
-    "image": "quay.io\/pterodactyl\/core:source",
-    "startup": ".\/server.sh --galaxy-name \\\"{{GALAXY_NAME}}\\\" --admin {{ADMIN_ID}} --datapath galaxy --port {{SERVER_PORT}} --query-port {{QUERY_PORT}} --steam-master-port {{STEAM_MASTER_PORT}} --steam-query-port {{STEAM_QUERY_PORT}} --max-players {{MAX_PLAYERS}} --difficulty {{DIFFICULTY}} --collision-damage {{COLLISION_DMG}} --save-interval {{SAVE_INTERVAL}} --same-start-sector {{SAME_START_SECTOR}} --server-name \\\"{{SERVER_NAME}}\\\" --threads {{GAME_THREADS}} --listed {{SERVER_LISTED}}",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": ".\/bin\/AvorionServer --galaxy-name {{GALAXY_NAME}} --admin {{ADMIN_ID}} --datapath galaxy --port {{SERVER_PORT}} --query-port {{QUERY_PORT}} --steam-master-port {{STEAM_MASTER_PORT}} --steam-query-port {{STEAM_QUERY_PORT}} --max-players {{MAX_PLAYERS}} --difficulty {{DIFFICULTY}} --collision-damage {{COLLISION_DMG}} --save-interval {{SAVE_INTERVAL}} --same-start-sector {{SAME_START_SECTOR}} --server-name \\\"{{SERVER_NAME}}\\\" --threads {{GAME_THREADS}} --listed {{SERVER_LISTED}}",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"Server startup complete\",\r\n    \"userInteraction\": []\r\n}",
@@ -17,8 +24,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Avorion Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steamcmd\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\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[[ \"$SERVER_BETA\" == \"true\" ]] && beta_arg=\"beta\" || beta_arg=\"NONE\"\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${APP_ID} -beta \"$beta_arg\" validate +exit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/steamclient.so\r\nmkdir -p \/mnt\/server\/backups\r\nmkdir -p \/mnt\/server\/galaxy\/\"${GALAXY_NAME}\"\r\ncurl https:\/\/raw.githubusercontent.com\/iamkubi\/eggs\/master\/avorion\/server.ini --output \/mnt\/server\/galaxy\/\"${GALAXY_NAME}\"\/server.ini",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# Avorion Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n\r\n[[ \"$SERVER_BETA\" == \"true\" ]] && beta_arg=\"beta\" || beta_arg=\"NONE\"\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +force_install_dir \/mnt\/server +app_update ${APP_ID} -beta \"$beta_arg\" validate +exit\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\nmkdir -p \/mnt\/server\/backups\r\nmkdir -p \/mnt\/server\/galaxy\/${GALAXY_NAME}\r\ncurl https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/avorion\/server.ini --output \/mnt\/server\/galaxy\/${GALAXY_NAME}\/server.ini",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -28,8 +35,8 @@
             "description": "Name of the Galaxy to create",
             "env_variable": "GALAXY_NAME",
             "default_value": "Avorion",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:32"
         },
         {
@@ -37,8 +44,8 @@
             "description": "The name of the server, shown in the server list.",
             "env_variable": "SERVER_NAME",
             "default_value": "Avorion Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:64"
         },
         {
@@ -46,8 +53,8 @@
             "description": "Steam64 ID for the player to make Server Admin",
             "env_variable": "ADMIN_ID",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -55,8 +62,8 @@
             "description": "Maximum number of players allowed",
             "env_variable": "MAX_PLAYERS",
             "default_value": "10",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|int|max:64"
         },
         {
@@ -64,8 +71,8 @@
             "description": "Difficulty of the server, allowed values are: -3, -2, -1, 0, 1, 2, 3 Default: 0",
             "env_variable": "DIFFICULTY",
             "default_value": "0",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer|max:3|min:-3"
         },
         {
@@ -73,8 +80,8 @@
             "description": "A multiplier for damage to colliding objects. Accepts floating-point numbers, e.g. 0.5 is 50% collision damage. 0: no damage, 1: full damage. default: 1",
             "env_variable": "COLLISION_DMG",
             "default_value": "1",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -82,8 +89,8 @@
             "description": "Time between automatic saves in seconds.  Defaults to 300 (5 minutes).",
             "env_variable": "SAVE_INTERVAL",
             "default_value": "300",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -91,8 +98,8 @@
             "description": "Indicates if all players should start in the same sector. If false, a random empty sector on the outer rim is populated and used as the home sector for each new player.",
             "env_variable": "SAME_START_SECTOR",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|in:true,false"
         },
         {
@@ -100,8 +107,8 @@
             "description": "Number of concurrent threads that are used to update sectors. (Identical to the 'Threads' setting ingame.)",
             "env_variable": "GAME_THREADS",
             "default_value": "1",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer|max:20"
         },
         {
@@ -109,8 +116,8 @@
             "description": "Privacy setting. If enabled together with useSteam, the server will show up in public server lists. (Same as the ingame setting 'List Publicly')",
             "env_variable": "SERVER_LISTED",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|in:true,false"
         },
         {
@@ -118,17 +125,17 @@
             "description": "Set to true to enable beta, false for stable.",
             "env_variable": "SERVER_BETA",
             "default_value": "false",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|in:true,false"
         },
         {
             "name": "Steam App ID",
             "description": "",
-            "env_variable": "APP_ID",
+            "env_variable": "SRCDS_APPID",
             "default_value": "565060",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -136,8 +143,8 @@
             "description": "",
             "env_variable": "LD_LIBRARY_PATH",
             "default_value": ".\/linux64",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -145,8 +152,8 @@
             "description": "",
             "env_variable": "STEAM_MASTER_PORT",
             "default_value": "27021",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -154,8 +161,8 @@
             "description": "",
             "env_variable": "STEAM_QUERY_PORT",
             "default_value": "27020",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -163,9 +170,18 @@
             "description": "",
             "env_variable": "QUERY_PORT",
             "default_value": "27003",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Auto Update",
+            "description": "1 = on; 0 = off",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/barotrauma/README.md b/game_eggs/steamcmd_servers/barotrauma/README.md
index 0e0f1cfa..68b2f7d1 100644
--- a/game_eggs/steamcmd_servers/barotrauma/README.md
+++ b/game_eggs/steamcmd_servers/barotrauma/README.md
@@ -1,9 +1,11 @@
 # Barotrauma
-### From their [Steam Description](https://store.steampowered.com/app/602960/Barotrauma/)
+
+## From their [Steam Description](https://store.steampowered.com/app/602960/Barotrauma/)
+
 Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It’s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear.
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port       | default |
@@ -14,7 +16,8 @@ Ports required to run the server in a table format.
 **WARNING
 You must edit the port and server settings in serversettings.xml file or your server will not work!**
 
-### No console
+## No console
+
 Barotrauma server does not currently have server console, it will just spam random messages. You have to add yourself as admin and type commands in-game. Admin file is located at Data/clientpermissions.xml, example config is below.
 
 ```<?xml version="1.0" encoding="utf-8"?>
@@ -22,5 +25,5 @@ Barotrauma server does not currently have server console, it will just spam rand
   <Client
     name="YOUR INGAME NAME HERE"
     steamid="YOUR STEAM64ID here"
-    preset="Admin" />  
+    preset="Admin" />
 </ClientPermissions>
diff --git a/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json b/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json
index 3db84636..4cc6a1f7 100644
--- a/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json
+++ b/game_eggs/steamcmd_servers/barotrauma/egg-barotrauma.json
@@ -1,14 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-14T04:12:32+02:00",
+    "exported_at": "2021-11-26T14:40:35+01:00",
     "name": "Barotrauma",
     "author": "admin@softwarenoob.com",
     "description": "Barotrauma is a 2D co-op survival horror submarine simulator, inspired by games like FTL: Faster Than Light, Rimworld, Dwarf Fortress and Space Station 13. It\u2019s a Sci-Fi game that combines ragdoll physics and alien sea monsters with teamwork and existential fear.",
-    "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/DedicatedServer -batchmode",
     "config": {
         "files": "{}",
@@ -18,10 +24,29 @@
     },
     "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=1026340\r\n\r\n## just in case someone removed the defaults.\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\n\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 ${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# Image to install with is 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} ${INSTALL_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\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
-    "variables": []
-}
\ No newline at end of file
+    "variables": [
+        {
+            "name": "SRCDS_APPID",
+            "description": "",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "1026340",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Auto Update",
+            "description": "1 = on; 0 = off",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
diff --git a/game_eggs/steamcmd_servers/citadel/README.md b/game_eggs/steamcmd_servers/citadel/README.md
index e85ca5c1..63290dc2 100644
--- a/game_eggs/steamcmd_servers/citadel/README.md
+++ b/game_eggs/steamcmd_servers/citadel/README.md
@@ -1,4 +1,5 @@
 # Citadel: Forged with fire
+
 Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.
 
 ## Server Ports
diff --git a/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json b/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json
index d8f8e048..1c294c12 100644
--- a/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json
+++ b/game_eggs/steamcmd_servers/citadel/egg-citadel-forged-with-fire.json
@@ -1,13 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-04-21T09:35:15+02:00",
+    "exported_at": "2021-11-26T14:44:12+01:00",
     "name": "Citadel: Forged with Fire",
     "author": "info@goover.de",
     "description": "Citadel: Forged With Fire is a massive online sandbox RPG set in the mystical world of Ignus. Featuring magic, spellcasting, building, exploring and crafting as you fight to make a name for yourself and achieve notoriety across the land.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/CitadelServer.sh",
     "config": {
         "files": "{\r\n    \"Config\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ConnectionPort=\": \"ConnectionPort={{server.build.default.port}}\",\r\n            \"QueryPort=\": \"QueryPort={{server.build.env.QPORT}}\",\r\n            \"Password\": \"Password={{server.build.env.ADMIN_PASSWD}}\"\r\n        }\r\n    }\r\n}",
@@ -17,19 +24,19 @@
     },
     "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    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\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\r\n\r\n##Copy steamclient.so to correct Dir\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n## Create Game.ini\r\nmkdir $HOME\/Config\r\n\r\nif [[ -d $HOME\/Citadel\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nif [[ -d $HOME\/Engine\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Engine\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nmkdir -p $HOME\/Citadel\/Saved\/Config\r\nmkdir -p $HOME\/Engine\/Saved\/Config\r\n\r\nln -s ..\/..\/..\/Config $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nln -s ..\/..\/..\/Config $HOME\/Engine\/Saved\/Config\/LinuxServer\r\n\r\n#rm -fR $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT > $HOME\/Config\/Game.ini\r\n[UWorks]\r\nConnectionPort=7777\r\nQueryPort=27015\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"CitadelServer\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=20,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000,StructureDecayMultiplier=2.000000,bThronesDecay=true)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# steamcmd Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 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\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\r\n\r\n##Copy steamclient.so to correct Dir\r\nmkdir -p $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nchmod -R a+w,a+x $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\r\nif [[ ! -f $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so ]]; then \r\n\tln -s ..\/..\/..\/..\/..\/..\/linux64\/steamclient.so $HOME\/Citadel\/Plugins\/UWorks\/Source\/ThirdParty\/Linux\/steamclient.so\r\n\r\nfi\r\n\r\n## Create Game.ini\r\nmkdir $HOME\/Config\r\n\r\nif [[ -d $HOME\/Citadel\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nif [[ -d $HOME\/Engine\/Saved\/Config\/LinuxServer ]]; then \r\n\trm -rf $HOME\/Engine\/Saved\/Config\/LinuxServer\r\nfi\r\n\r\nmkdir -p $HOME\/Citadel\/Saved\/Config\r\nmkdir -p $HOME\/Engine\/Saved\/Config\r\n\r\nln -s ..\/..\/..\/Config $HOME\/Citadel\/Saved\/Config\/LinuxServer\r\nln -s ..\/..\/..\/Config $HOME\/Engine\/Saved\/Config\/LinuxServer\r\n\r\n#rm -fR $HOME\/Citadel\/Saved\/Config\/LinuxServer\/Game.ini\r\ncat <<EOT > $HOME\/Config\/Game.ini\r\n[UWorks]\r\nConnectionPort=7777\r\nQueryPort=27015\r\n\r\n[\/Script\/Citadel.SocialManager]\r\nPassword=changeme\r\n\r\n[\/Script\/Citadel.CitadelGameInstance]\r\nWorldCreationSettings=(ServerName=\"CitadelServer\",Password=\"YourServerPassword\",ServerType=PVP,PlayerLimit=20,bPrivate=true,ExperienceMultiplier=1.000000,InventoryCapacityMultipler=1.000000,KnowledgePointEarnedMultiplier=1.000000,CharacterPointEarnedMultiplier=1.000000,bUnlimitedResources=false,PlayerDamageMultiplier=1.000000,ArmorMultiplier=1.000000,BaseManaRegen=1.000000,bInventoryWeightRestrictions=true,MagicFindMultiplier=1.000000,CraftingMagicFindChanceMultiplier=1.000000,FlyingCostMultiplier=1.000000,FlyingSpeedMultiplier=1.000000,ResourceCollectionMultiplier=1.000000,StructureDamageMultiplier=1.000000,bRespectNoBuildZones=true,MagicStructureManaRegenerationMultiplier=1.000000,MagicStructureManaConsumptionMultiplier=0.000000,bFreeBuildMode=false,TimeOfDayLock=Auto,NPCPopulationMultiplier=1.000000,StructureDecayMultiplier=2.000000,bThronesDecay=true)\r\nEOT\r\n\r\nchmod +x $HOME\/CitadelServer.sh",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
     "variables": [
         {
-            "name": "Game ID",
+            "name": "SRCDS_APPID",
             "description": "ID",
             "env_variable": "SRCDS_APPID",
             "default_value": "489650",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|numeric|digits_between:1,6"
         },
         {
@@ -37,8 +44,8 @@
             "description": "port",
             "env_variable": "QPORT",
             "default_value": "27015",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:100"
         },
         {
@@ -46,9 +53,18 @@
             "description": "",
             "env_variable": "ADMIN_PASSWD",
             "default_value": "changeme",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:100"
+        },
+        {
+            "name": "Auto Update",
+            "description": "1 = on; 0 = off",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/conan_exiles/README.md b/game_eggs/steamcmd_servers/conan_exiles/README.md
index 4ec44fe6..32017867 100644
--- a/game_eggs/steamcmd_servers/conan_exiles/README.md
+++ b/game_eggs/steamcmd_servers/conan_exiles/README.md
@@ -1,10 +1,15 @@
-### From their [Site](https://conanexiles.com/)
+# Conan Exiles
+
+## From their [Site](https://conanexiles.com/)
+
 Conan Exiles is online multiplayer survival game set in the lands of Conan the Barbarian
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 This server requires about 4096m to run properly.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
@@ -12,4 +17,4 @@ Ports required to run the server in a table format.
 | Game    | 7777 |
 | Steam Query | 27015 |
 
-### More information can be found [here](https://forums.funcom.com/t/conan-exiles-dedicated-server-app-latest-version-1-0-21/21699)
\ No newline at end of file
+## More information can be found [here](https://forums.funcom.com/t/conan-exiles-dedicated-server-app-latest-version-1-0-21/21699)
diff --git a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json
index f7fc3df2..4618f5ba 100644
--- a/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json
+++ b/game_eggs/steamcmd_servers/conan_exiles/egg-conan-exiles.json
@@ -1,13 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-10-24T11:25:01+00:00",
+    "exported_at": "2022-01-20T12:47:23-05:00",
     "name": "Conan Exiles",
     "author": "brycea@terrahost.cloud",
     "description": "Conan Exiles is an open-world survival game set in the brutal lands of Conan the Barbarian. Survive in a savage world, build your kingdom, and dominate your enemies in brutal combat and epic warfare.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5"
+    ],
+    "file_denylist": [],
     "startup": "xvfb-run --auto-servernum wine \/home\/container\/ConanSandboxServer.exe -console -log -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}}",
     "config": {
         "files": "{}",
@@ -17,7 +24,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\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} +@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\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\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} +@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": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -69,4 +76,4 @@
             "rules": "required|numeric|max:65535"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/craftopia/README.md b/game_eggs/steamcmd_servers/craftopia/README.md
new file mode 100644
index 00000000..5bf1200a
--- /dev/null
+++ b/game_eggs/steamcmd_servers/craftopia/README.md
@@ -0,0 +1,11 @@
+# Craftopia
+
+Craftopia is the brand new crafting game we made by combining excellent features of various existing crafting games.
+
+## Server Ports
+
+Craftopia requires 1 port to run.
+
+| Port        | default |
+|-------------|---------|
+| Game        | 27015   |
diff --git a/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json
new file mode 100644
index 00000000..5a24cf53
--- /dev/null
+++ b/game_eggs/steamcmd_servers/craftopia/egg-craftopia.json
@@ -0,0 +1,61 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2022-01-11T16:08:26+01:00",
+    "name": "Craftopia",
+    "author": "info@goover.de",
+    "description": "Craftopia is the brand new multiplayer survival action game made in Japan. We combined many features we find enjoyable, such as hunting, farming, hack-and-slash, building, automation to develop this game.",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": ".\/Craftopia.x86_64",
+    "config": {
+        "files": "{\r\n    \"ServerSetting.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"name=\": \"name={{server.build.env.WORLD_NAME}}\",\r\n            \"port=\": \"port={{server.build.default.port}}\"\r\n       }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"World is loaded!\"\r\n}",
+        "logs": "{}",
+        "stop": "^^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n#SRCDS_APPID - steam app id found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n \r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_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\/parkervcp\/installers:debian",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "SRCDS_APPID",
+            "description": "",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "1670340",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Auto Update",
+            "description": "",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "World Name",
+            "description": "",
+            "env_variable": "WORLD_NAME",
+            "default_value": "Pterodactyl Server",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:50"
+        }
+    ]
+}
diff --git a/game_eggs/cryofall/cryofall/README.md b/game_eggs/steamcmd_servers/cryofall/README.md
similarity index 65%
rename from game_eggs/cryofall/cryofall/README.md
rename to game_eggs/steamcmd_servers/cryofall/README.md
index 12385a54..6565246e 100644
--- a/game_eggs/cryofall/cryofall/README.md
+++ b/game_eggs/steamcmd_servers/cryofall/README.md
@@ -1,13 +1,15 @@
 # CryoFall
 
-##Minimum RAM warning
+## Minimum RAM warning
+
 You may want to assign a minimum of 1GB of RAM to a server.
 
-##Required Server Ports
+## Server Ports
+
 The default is 6000 can be changed in SettingsServer.xml
 
 | Port    | default |
 |---------|---------|
 | Game    | 6000    |
 
-#### Plugins may require ports to be added to the server.
\ No newline at end of file
+### Plugins may require ports to be added to the server
diff --git a/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json
new file mode 100644
index 00000000..cec181d5
--- /dev/null
+++ b/game_eggs/steamcmd_servers/cryofall/egg-cryo-fall.json
@@ -0,0 +1,43 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-11-19T11:47:49+01:00",
+    "name": "CryoFall",
+    "author": "contact@zennodes.dk",
+    "description": "NOTE: For now you have to change SettingsServer.xml under CryoFall_Server_v(Version)_NetCore\/Data\/SettingsServer.xml\r\n\r\nCryoFall is a sci-fi multiplayer colony simulation survival game set on a forgotten planet in a distant future.\r\n\r\nJoin the vast world of CryoFall together with other survivors to rebuild your civilization from scratch. Start with primitive technology and simple tools and use them to progress towards modern industrial might and even beyond, eventually reaching space-age technology only seen in science fiction.\r\n\r\nCryoFall can be played either as a relaxed PvE experience with no competition or as a brutal and unforgiving PvP. Make your choice and join one of many available servers with different game modes or host your own and invite your friends to join you!\r\n\r\nBuild your house or a large base together with other players. Dig wells and create farms to sustain basic needs. Build vehicles to explore the world faster. Establish basics of science, all the way from medicine and chemistry to fuel creation and even lithium extraction to create electronic devices. Cook food or prepare drinks to sell them from vending machines in your store.\r\n\r\nBuild factories to produce on an industrial scale: Weapons and defense systems, bionic implants to augment yourself, even large war machines and artillery guns to use against the biggest of opponents",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:dotnet_6"
+    ],
+    "file_denylist": [],
+    "startup": "dotnet Binaries\/Server\/CryoFall_Server.dll loadOrNew",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"[IMP] UDPServer: Socket-server listening on \"\r\n}",
+        "logs": "{}",
+        "stop": "stop 10 stopping server"
+    },
+    "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# INSTALL_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 lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} ${INSTALL_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\/parkervcp\/installers:debian",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "SRCDS_APPID",
+            "description": "",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "1061710",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
diff --git a/game_eggs/steamcmd_servers/dont_starve/README.md b/game_eggs/steamcmd_servers/dont_starve/README.md
index 7d8d6e36..5236e70d 100644
--- a/game_eggs/steamcmd_servers/dont_starve/README.md
+++ b/game_eggs/steamcmd_servers/dont_starve/README.md
@@ -1,20 +1,23 @@
 # Don't Starve Together
-### From their [site](https://www.klei.com/games/dont-starve)
-Don’t Starve is an uncompromising wilderness survival game full of science and magic. 
 
-You play as Wilson, an intrepid Gentleman Scientist who has been trapped by a demon and transported to a mysterious wilderness world. Wilson must learn to exploit his environment and its inhabitants if he ever hopes to escape and find his way back home. 
+## From their [site](https://www.klei.com/games/dont-starve)
+
+Don’t Starve is an uncompromising wilderness survival game full of science and magic.
+
+You play as Wilson, an intrepid Gentleman Scientist who has been trapped by a demon and transported to a mysterious wilderness world. Wilson must learn to exploit his environment and its inhabitants if he ever hopes to escape and find his way back home.
 
 Enter a strange and unexplored world full of strange creatures, dangers, and surprises. Gather resources to craft items and structures that match your survival style. Play your way as you unravel the mysteries of this strange land.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 Minimum required memory to run the server is around 512mb for a single user..
 
+## Server Ports
 
-### Server Ports
 Don't Starve Together only requires a single port to run. The default is 10999
 
 | Port    | default |
 |---------|---------|
-| Game    | 10998   |
+| Game    | 10999   |
 
-#### Mods/Plugins may require ports to be added to the server.
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json b/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json
index fac6f1a4..7ac34fcf 100644
--- a/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json
+++ b/game_eggs/steamcmd_servers/dont_starve/egg-don-t-starve-together.json
@@ -8,7 +8,9 @@
     "name": "Don't Starve Together",
     "author": "parker@parkervcp.com",
     "description": "Don\u2019t Starve Together is an uncompromising wilderness survival game full of science and magic.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_source"
     ],
@@ -110,4 +112,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/eco/README.md b/game_eggs/steamcmd_servers/eco/README.md
index 147bda91..4ae287a2 100644
--- a/game_eggs/steamcmd_servers/eco/README.md
+++ b/game_eggs/steamcmd_servers/eco/README.md
@@ -1,15 +1,16 @@
 # Eco
-Steam Description  
+
+Steam Description
 Eco is a community-based game; the players develop laws, government, and an economy to determine the success of their world. We need extensive playtesting to get the balance of our core features just right. Early Access is the perfect fit for finding an audience for this while also funding additional development.
 
-### Server Ports
+## Server Ports
+
 Eco requires up to 2 ports
 
 game port (default 3000)
 web port (default 3001)
 
-
 | Port    | default       |
 |---------|---------------|
 | Game    |     3000      |
-| Web     |     3001      |
\ No newline at end of file
+| Web     |     3001      |
diff --git a/game_eggs/steamcmd_servers/eco/egg-eco.json b/game_eggs/steamcmd_servers/eco/egg-eco.json
index 85ffcfbf..2427f1c6 100644
--- a/game_eggs/steamcmd_servers/eco/egg-eco.json
+++ b/game_eggs/steamcmd_servers/eco/egg-eco.json
@@ -8,7 +8,9 @@
     "name": "Eco",
     "author": "info@goover.de",
     "description": "Eco is an online world from Strange Loop Games where players must build civilization using resources from an ecosystem that can be damaged and destroyed. The world of Eco is an incredibly reactive one, and whatever any player does in the world affects the underlying ecosystem.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_dotnet-5"
     ],
@@ -92,4 +94,4 @@
             "rules": "required|string|max:50"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/fof/README.md b/game_eggs/steamcmd_servers/fof/README.md
index 58fc0779..96e8256f 100644
--- a/game_eggs/steamcmd_servers/fof/README.md
+++ b/game_eggs/steamcmd_servers/fof/README.md
@@ -4,7 +4,8 @@
 
 Multiplayer based, first person enabled, action packed and skill demanding shooter set in the Wild West times. A unique combination of non stop action and slow but powerful weaponry.
 
-### Server Ports
+## Server Ports
+
 FOF servers require 1 port to be open, the SourceTV port can also be opened for spectators.
 
 | Port      | default |
diff --git a/game_eggs/steamcmd_servers/fof/egg-fof.json b/game_eggs/steamcmd_servers/fof/egg-fof.json
index 1ad65cd8..f6a74f04 100644
--- a/game_eggs/steamcmd_servers/fof/egg-fof.json
+++ b/game_eggs/steamcmd_servers/fof/egg-fof.json
@@ -8,7 +8,9 @@
     "name": "Fof",
     "author": "avalongamecs@gmail.com",
     "description": "Fistful of Frags",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/pterodactyl\/core:source"
     ],
diff --git a/game_eggs/steamcmd_servers/hlds_server/README.md b/game_eggs/steamcmd_servers/hlds_server/README.md
index 8f65ef99..71480325 100644
--- a/game_eggs/steamcmd_servers/hlds_server/README.md
+++ b/game_eggs/steamcmd_servers/hlds_server/README.md
@@ -2,11 +2,12 @@
 
 This is for older games like CS 1.6 (default game) and other servers that still run on the older HLDS server under id 90
 
-### Server Ports
+## Server Ports
+
 HLDS servers require up to 6 ports
 
 | Port      | default |
 |-----------|---------|
 | Game/rcon | 27015   |
 | HLTV      | 27020   |
-| VAC       | 26900   |
\ No newline at end of file
+| VAC       | 26900   |
diff --git a/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json b/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json
index 173dc848..3d6c6251 100644
--- a/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json
+++ b/game_eggs/steamcmd_servers/hlds_server/egg-custom-h-l-d-s-engine-game.json
@@ -1,23 +1,30 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-06-28T20:41:35-04:00",
+    "exported_at": "2022-01-20T12:52:11-05:00",
     "name": "Custom HLDS Engine Game",
     "author": "parker@parkervcp.com",
     "description": "This option allows modifying the startup arguments and other details to run a custom HLDS based game on the panel.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source"
+    ],
+    "file_denylist": [],
     "startup": ".\/hlds_run -console -game {{HLDS_GAME}} -port {{SERVER_PORT}} -sport {{VAC_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
     "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# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +app_set_config 90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
+            "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} +app_set_config 90 mod ${HLDS_GAME} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
             "container": "ubuntu:18.04",
             "entrypoint": "bash"
         }
@@ -28,8 +35,8 @@
             "description": "The ID corresponding to the game to download and run using HLDS.\r\n\r\nThe HLDS server ID is 90. This should not be changed.",
             "env_variable": "SRCDS_APPID",
             "default_value": "90",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|numeric|digits_between:1,6"
         },
         {
@@ -37,8 +44,8 @@
             "description": "The name corresponding to the game to download and run using HLDS.\r\n\r\nall the HLDS server names are here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Server_Name_Enumeration",
             "env_variable": "HLDS_GAME",
             "default_value": "cstrike",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|alpha_dash|between:1,100"
         },
         {
@@ -46,8 +53,8 @@
             "description": "The default map for the server.",
             "env_variable": "SRCDS_MAP",
             "default_value": "de_dust2",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|alpha_dash"
         },
         {
@@ -55,8 +62,8 @@
             "description": "Specifies the VAC port the server should use. Default is 26900.",
             "env_variable": "VAC_PORT",
             "default_value": "26900",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|numeric|digits_between:1,5"
         }
     ]
diff --git a/game_eggs/steamcmd_servers/holdfast/README.md b/game_eggs/steamcmd_servers/holdfast/README.md
index 73b47c7e..d49246ae 100644
--- a/game_eggs/steamcmd_servers/holdfast/README.md
+++ b/game_eggs/steamcmd_servers/holdfast/README.md
@@ -1,23 +1,17 @@
-# What is Holdfast: Nations At War ?
+# What is Holdfast: Nations At War
+
 Fight on multiple fronts in Holdfast: Nations At War - A competitive multiplayer first and third person shooter set during the great Napoleonic Era. Charge into battle with over 150 players per server!
 
->  [Holdfast: NaW](https://store.steampowered.com/app/589290/Holdfast_Nations_At_War/)
+>[Holdfast: NaW](https://store.steampowered.com/app/589290/Holdfast_Nations_At_War/)
 
-<img src="https://steamcdn-a.akamaihd.net/steam/apps/589290/capsule_616x353.jpg?t=1600279941" alt="logo" width="300"/></img>
+![image](https://steamcdn-a.akamaihd.net/steam/apps/589290/capsule_616x353.jpg?t=1600279941)
 
-# How to import an egg in [Pterodactyl](https://pterodactyl.io/)
+## Server Ports
 
-1. Download [egg-holdfast-na-w.json](https://github.com/ankit2951/pterodactyl-holdfast/blob/main/egg-holdfast-na-w.json).
-> It's easiest to right click the raw button and save as.
-2. In your panel go to the Nests section in the admin part of the panel
-3. Click the green Import Egg button
-4. Browse to the json file you saved earlier
-5. Select what nest you want to put the egg in.
-> If you want a new nest you need to create it before importing the egg.
-6. Restart the daemon on your node before creating a server using the new egg(s).
+These are the servers required ports
 
-server_port 20100
-steam_communications_port 8700
-steam_query_port 27000
-
-# You must restart your daemon after importing an egg
+| Port           | default |
+|----------------|---------|
+| Game           | 20100   |
+| Query          | 27000   |
+| Communications | 8700    |
diff --git a/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json b/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json
index f04c4fcd..a774cddc 100644
--- a/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json
+++ b/game_eggs/steamcmd_servers/holdfast/egg-holdfast-na-w.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-10-18T19:13:53-04:00",
+    "exported_at": "2022-01-20T12:53:50-05:00",
     "name": "Holdfast NaW",
     "author": "ankit@bmghosting.com",
     "description": "Holdfast: Nations at War",
-    "image": "bmghosting\/pterodactyl-holdfast",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "bmghosting\/pterodactyl-holdfast"
+    ],
+    "file_denylist": [],
     "startup": "\".\/holdfastnaw-dedicated\/Holdfast NaW\" -startserver -batchmode -nographics -screen-width 320 -screen-height 240 -screen-quality Fastest -framerate {{FPSMAX}} --serverheadless -serverConfigFilePath holdfastnaw-dedicated\/configs\/{{SERVER_CONFIG_PATH}} -logFile holdfastnaw-dedicated\/logs_output\/output_{{SERVER_CONFIG_PATH}} -logArchivesDirectory holdfastnaw-dedicated\/{{SERVER_LOG_ARCHIVE_PATH}}\/ -adminCommandsLogFilePath holdfastnaw-dedicated\/logs_adminactions\/admin_{{SERVER_CONFIG_PATH}} -playersLogFilePath holdfastnaw-dedicated\/logs_playerlogin\/players_{{SERVER_CONFIG_PATH}} -scoreboardLogFilePath holdfastnaw-dedicated\/logs_score\/scorelog_{{SERVER_CONFIG_PATH}} -chatLogFilePath holdfastnaw-dedicated\/logs_chat\/chatlog_{{SERVER_CONFIG_PATH}} -workshopDataPath holdfastnaw-dedicated\/workshop -micSpammersPlayersFilePath holdfastnaw-dedicated\/micspammers.txt -mutedVoipPlayersFilePath holdfastnaw-dedicated\/mutedplayersvoip.txt -mutedChatPlayersFilePath holdfastnaw-dedicated\/mutedplayerschat.txt -bannedPlayersFilePath holdfastnaw-dedicated\/bannedplayers.txt -p {{SERVER_PORT}} -l \"94.130.66.231\" -o 7101",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"STEAMAPPS_INTERFACE_VERSION008\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"STEAMAPPS_INTERFACE_VERSION008\"\r\n}",
+        "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
@@ -141,4 +148,4 @@
             "rules": "nullable|string|max:100"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/hurtworld/README.md b/game_eggs/steamcmd_servers/hurtworld/README.md
index eb62c64e..0fbc72a6 100644
--- a/game_eggs/steamcmd_servers/hurtworld/README.md
+++ b/game_eggs/steamcmd_servers/hurtworld/README.md
@@ -1,10 +1,13 @@
 # Hurtworld
-### From their [website](http://hurtworld.com/)
 
-### Install notes
+## From their [website](http://hurtworld.com/)
+
+## Install notes
+
 Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.
 
-### Server Ports
+## Server Ports
+
 These are the servers required ports
 
 | Port    | default |
@@ -12,4 +15,4 @@ These are the servers required ports
 | Game    | 12871   |
 | Query   | 13871   |
 
-#### Mods/Plugins may require ports to be added to the server.
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json b/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json
index 135369c1..37d3c695 100644
--- a/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json
+++ b/game_eggs/steamcmd_servers/hurtworld/egg-hurtworld.json
@@ -1,23 +1,30 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-04-16T20:41:27-04:00",
+    "exported_at": "2022-01-20T12:55:06-05:00",
     "name": "Hurtworld",
     "author": "brycea@terrahost.cloud",
     "description": "Hurtworld is a hardcore multiplayer survival FPS with a focus on deep survival progression that doesn't become trivial once you establish some basic needs. Built for hardcore gamers, Hurtworld aims to punish.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_source"
+    ],
+    "file_denylist": [],
     "startup": ".\/Hurtworld.x86_64 -batchmode -nographics -exec \"host {{SERVER_PORT}};queryport {{QUERY_PORT}};maxplayers {{MAX_PLAYERS}};servername {{HOSTNAME}};creativemode ${CREATIVE_MODE};${ADMINS}\" -logfile $1",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"orphaned items\"\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "logs": "{}",
         "stop": "^C"
     },
     "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\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",
+            "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\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": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -28,8 +35,8 @@
             "description": "The ID corresponding to the game to download and run using SRCDS.",
             "env_variable": "SRCDS_APPID",
             "default_value": "405100",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|regex:\/^(405100)$\/"
         },
         {
@@ -37,8 +44,8 @@
             "description": "Server Query Default Port",
             "env_variable": "QUERY_PORT",
             "default_value": "13871",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|string"
         },
         {
@@ -46,8 +53,8 @@
             "description": "Max players allowed on the server at one time.",
             "env_variable": "MAX_PLAYERS",
             "default_value": "60",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:60"
         },
         {
@@ -55,9 +62,9 @@
             "description": "The name of your server in the public server list.",
             "env_variable": "HOSTNAME",
             "default_value": "A Hurtworld Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:50"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md b/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md
index 61d81823..83fc4d38 100644
--- a/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md
+++ b/game_eggs/steamcmd_servers/insurgency_sandstorm/README.md
@@ -1,18 +1,24 @@
 # Insurgency: Sandstorm
-Steam Description  
+
+Steam Description
 Insurgency: Sandstorm is a team-based, tactical FPS based on lethal close quarters combat and objective-oriented multiplayer gameplay. Experience the intensity of modern combat where skill is rewarded, and teamwork wins the fight.
 
 ## GSLT Authentication
+
 In order for your server to be able to authenticate with the stats server, you must authenticate your server through using a Steam GSLT (Game Server Login Token).
 
 To start your server with GSLT authentication add -GSLTToken=xxxxxxxxxxxxxxx to the server's command line where "xxxxxxxxxxxxxxx" is the token displayed on the Steam Game Server Account page.
 
-See the following for additional configurations - https://support.newworldinteractive.com/support/solutions/articles/47001115510-server-admin-guide
+See the following for additional configurations - <https://support.newworldinteractive.com/support/solutions/articles/47001115510-server-admin-guide>
 
 ## Recommended server settings
+
 ### Minimum Storage
+
 This server requires about 5632M to install.
+
 ### Minimum RAM
+
 This server requires about 1024M to run with no players.
 
 ## Server Ports
diff --git a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json
index 03c21356..562e9f4c 100644
--- a/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json
+++ b/game_eggs/steamcmd_servers/insurgency_sandstorm/egg-insurgency--sandstorm.json
@@ -1,13 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-06-27T05:17:21-04:00",
+    "exported_at": "2021-11-26T14:52:26+01:00",
     "name": "Insurgency: Sandstorm",
     "author": "brycea@terrahost.cloud",
     "description": "Insurgency: Sandstorm is a team-based, tactical FPS based on lethal close quarters combat and objective-oriented multiplayer gameplay. Experience the intensity of modern combat where skill is rewarded, and teamwork wins the fight.",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
     "startup": "\/home\/container\/Insurgency\/Binaries\/Linux\/InsurgencyServer-Linux-Shipping {{MAP_NAME}}?Scenario={{SCENARIO}}?MaxPlayers={{MAX_PLAYERS}} -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}} -log -hostname=\"{{HOSTNAME}}\"",
     "config": {
         "files": "{}",
@@ -17,8 +24,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n## install required packages to install insurgency: sandstorm\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n## install steamcmd\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\n## needs to be used for steamcmd to operate correctly\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n## install insurgency: sandstorm\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\nchmod +x \/mnt\/server\/Insurgency\/Binaries\/Linux\/InsurgencyServer-Linux-Shipping",
-            "container": "ubuntu:20.04",
+            "script": "apt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} ${INSTALL_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\nchmod +x \/mnt\/server\/Insurgency\/Binaries\/Linux\/InsurgencyServer-Linux-Shipping",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -28,8 +35,8 @@
             "description": "The ID corresponding to the game to download and run. Leave blank to avoid auto update.",
             "env_variable": "SRCDS_APPID",
             "default_value": "581330",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "nullable|numeric"
         },
         {
@@ -37,8 +44,8 @@
             "description": "The name to appear in the server in the server list.",
             "env_variable": "HOSTNAME",
             "default_value": "My Insurgency Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:64"
         },
         {
@@ -46,17 +53,17 @@
             "description": "Query port for your Insurgency server.",
             "env_variable": "QUERY_PORT",
             "default_value": "27131",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric"
         },
         {
             "name": "Max Players",
             "description": "Sets the maximum number of players.",
-            "env_variable": "MAXPLAYERS",
+            "env_variable": "MAX_PLAYERS",
             "default_value": "28",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric"
         },
         {
@@ -64,8 +71,8 @@
             "description": "Default map to run when starting the server. Scenario must be available with the provided map.",
             "env_variable": "MAP_NAME",
             "default_value": "Canyon",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -73,9 +80,18 @@
             "description": "By default, a server will cycle through all Versus (PVP) scenarios available.",
             "env_variable": "SCENARIO",
             "default_value": "Scenario_Crossing_Checkpoint_Insurgents",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
+        },
+        {
+            "name": "Auto Update",
+            "description": "",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/killing_floor_2/README.md b/game_eggs/steamcmd_servers/killing_floor_2/README.md
index 49c02fd1..7e5eedde 100644
--- a/game_eggs/steamcmd_servers/killing_floor_2/README.md
+++ b/game_eggs/steamcmd_servers/killing_floor_2/README.md
@@ -1,8 +1,11 @@
 # Killing Floor 2
-### From their [Site](https://killingfloor2.com/)
+
+## From their [Site](https://killingfloor2.com/)
+
 In KILLING FLOOR 2, players descend into continental Europe after it has been overrun by horrific, murderous clones called Zeds that were created by the corporation Horzine. The Zed outbreak caused by Horzine Biotech’s failed experiments has quickly spread with unstoppable momentum, paralyzing the European Union. Only a month ago, the first Zed outbreak from the original KILLING FLOOR ripped through London; now the specimen clones are everywhere.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port       | default |
@@ -10,4 +13,4 @@ Ports required to run the server in a table format.
 | Game Port  | 7777    |
 | Query Port | 27015   |
 |Extra Ports |---------|
-| Web Admin  | 8080    |
\ No newline at end of file
+| Web Admin  | 8080    |
diff --git a/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json b/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json
index e7072f68..bdc08e4d 100644
--- a/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json
+++ b/game_eggs/steamcmd_servers/killing_floor_2/egg-killing-floor2.json
@@ -8,7 +8,9 @@
     "name": "Killing Floor 2",
     "author": "parker@parkervcp.com",
     "description": "In KILLING FLOOR 2, players descend into continental Europe after it has been overrun by horrific, murderous clones called Zeds that were created by the corporation Horzine. The Zed outbreak caused by Horzine Biotech\u2019s failed experiments has quickly spread with unstoppable momentum, paralyzing the European Union. Only a month ago, the first Zed outbreak from the original KILLING FLOOR ripped through London; now the specimen clones are everywhere.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_source"
     ],
diff --git a/game_eggs/steamcmd_servers/left4dead/README.md b/game_eggs/steamcmd_servers/left4dead/README.md
new file mode 100644
index 00000000..b4b7b611
--- /dev/null
+++ b/game_eggs/steamcmd_servers/left4dead/README.md
@@ -0,0 +1,16 @@
+# Left 4 Dead
+
+## From their [Website](https://www.l4d.com/)
+
+Set in the immediate aftermath of the zombie apocalypse, L4D's survival co-op mode lets you blast a path through the infected in four unique “movies,” guiding your survivors across the rooftops of an abandoned metropolis, through rural ghost towns and pitch-black forests in your quest to escape a devastated Ground Zero crawling with infected enemies. Each "movie" is comprised of five large maps, and can be played by one to four human players, with an emphasis on team-based strategy and objectives.
+
+### Server Ports
+
+L4D servers require 1 port to be open. The port can be safely changed to any other.
+
+| Port      | default |
+|-----------|---------|
+| Game/rcon | 27015   |
+
+## Steam Download [SteamStore](https://store.steampowered.com/app/500/Left_4_Dead/)
+
diff --git a/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json
new file mode 100644
index 00000000..c465949f
--- /dev/null
+++ b/game_eggs/steamcmd_servers/left4dead/egg-left4dead.json
@@ -0,0 +1,52 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-10-13T19:07:48+02:00",
+    "name": "Left 4 Dead",
+    "author": "pterodactyl@mazoyer.eu",
+    "description": "An outbreak of a highly contagious pathogen nicknamed the \"Green Flu\" begins in Pennsylvania. Two weeks after the first infection, four immune survivors, Bill, Zoey, Louis, and Francis make their way out of the city of Fairfield, only to discover that the infection is creating dangerous mutations in some of its hosts.",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": ".\/srcds_run -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
+    "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}",
+        "stop": "quit"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Game ID",
+            "description": "The ID corresponding to the game to download and run using SRCDS.",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "222840",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|regex:\/^(222840)$\/"
+        },
+        {
+            "name": "Default Map",
+            "description": "Default map used when starting the server.",
+            "env_variable": "SRCDS_MAP",
+            "default_value": "l4d_hospital01_apartment",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:40"
+        }
+    ]
+}
diff --git a/game_eggs/steamcmd_servers/left4dead_2/README.md b/game_eggs/steamcmd_servers/left4dead_2/README.md
new file mode 100644
index 00000000..affe440f
--- /dev/null
+++ b/game_eggs/steamcmd_servers/left4dead_2/README.md
@@ -0,0 +1,16 @@
+# Left 4 Dead 2
+
+## From their [Website](https://www.l4d.com/)
+
+Set in the zombie apocalypse, Left 4 Dead 2 (L4D2) is the highly anticipated sequel to the award-winning Left 4 Dead, the #1 co-op game of 2008.
+
+### Server Ports
+
+L4D 2 servers require 1 port to be open. The port can be safely changed to any other.
+
+| Port      | default |
+|-----------|---------|
+| Game/rcon | 27015   |
+
+## Steam Download [SteamStore](https://store.steampowered.com/app/550/Left_4_Dead_2/)
+
diff --git a/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json
new file mode 100644
index 00000000..4034580b
--- /dev/null
+++ b/game_eggs/steamcmd_servers/left4dead_2/egg-left4dead_2.json
@@ -0,0 +1,52 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-10-13T23:28:59+02:00",
+    "name": "Left 4 Dead 2",
+    "author": "pterodactyl@mazoyer.eu",
+    "description": "Left 4 Dead 2 is set in the aftermath of a worldwide pandemic of a disease nicknamed the \"Green Flu\", which rapidly transforms humans into zombie-like creatures and mutated forms that demonstrate extreme aggression towards non-infected beings. A few humans are immune to the disease, while some of those who are infected have no symptoms. The Civil Emergency and Defense Agency (CEDA) and the U.S. military create safe zones to attempt to evacuate as many survivors as possible.",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": ".\/srcds_run -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
+    "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}",
+        "stop": "quit"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# SRCDS Base Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd\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\n\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} +quit\r\n\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Game ID",
+            "description": "The ID corresponding to the game to download and run using SRCDS.",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "222860",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|regex:\/^(222860)$\/"
+        },
+        {
+            "name": "Default Map",
+            "description": "Default map used when starting the server.",
+            "env_variable": "SRCDS_MAP",
+            "default_value": "c1m1_hotel",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:40"
+        }
+    ]
+}
diff --git a/game_eggs/steamcmd_servers/modiverse/README.md b/game_eggs/steamcmd_servers/modiverse/README.md
index f61dfa0e..30424fb1 100644
--- a/game_eggs/steamcmd_servers/modiverse/README.md
+++ b/game_eggs/steamcmd_servers/modiverse/README.md
@@ -2,13 +2,13 @@
 
 Modiverse provides a sandbox environment with the ability to create and play mods such as TTT, Deathrun, FortWars, RP, and more! Use the many sandbox tools to build complex worlds with props, lights, thrusters, wheels, and much much more!
 
-### Information
+## Information
+
 Default ServerConfiguration.json is provided to start the server, you must modify it with your own mods to customize the server. The game is currently in beta and as such the console is filled with debug spam, developers have noted that this will be removed when the game releases.
 
 ## Server Ports
 
-
 | Port        | default |
 |-------------|---------|
 | Game        | 7777    |
-| Query     | 27015    |
\ No newline at end of file
+| Query       | 27015   |
diff --git a/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json b/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json
index 2c74f9cc..d141ee19 100644
--- a/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json
+++ b/game_eggs/steamcmd_servers/modiverse/egg-modiverse.json
@@ -8,7 +8,9 @@
     "name": "Modiverse",
     "author": "admin@softwarenoob.com",
     "description": "Modiverse provides a sandbox environment with the ability to create and play mods such as TTT, Deathrun, FortWars, RP, and more! Use the many sandbox tools to build complex worlds with props, lights, thrusters, wheels, and much much more!",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source"
     ],
diff --git a/game_eggs/steamcmd_servers/mordhau/README.md b/game_eggs/steamcmd_servers/mordhau/README.md
index d67ed494..692805b0 100644
--- a/game_eggs/steamcmd_servers/mordhau/README.md
+++ b/game_eggs/steamcmd_servers/mordhau/README.md
@@ -1,23 +1,23 @@
 # Mordhau
-Steam Description  
+
+Steam Description
 MORDHAU is a medieval first & third person multiplayer slasher. Enter a hectic battlefield of up to 64 players as a mercenary in a fictional, but realistic world, where you will get to experience the brutal and satisfying melee combat that will have you always coming back for more.
 
-### Versions
+## Versions
+
+### Vanilla
 
-#### Vanilla
 A standard linux mordhau server
 
-#### Wine
-The windows version of the server running in Wine.  
-This supports some mods that do not work with the linux version of the server.  
+### Wine
+
+The windows version of the server running in Wine.
+This supports some mods that do not work with the linux version of the server.
 Uses more resources for the server than the linux version.
 
-### Server Ports
-Mordhau requires 3 ports
+## Server Ports
 
-game port (default 7777)
-query port (default 27015)
-Beacon (default 15000)
+Mordhau requires 3 ports
 
 | Port    | default       |
 |---------|---------------|
@@ -25,11 +25,13 @@ Beacon (default 15000)
 | Query   | 27015         |
 | Beacon  | 15000         |
 
-### Map Rotation / Change Config
+## Map Rotation / Change Config
+
 Lots of good information in this [thread](https://mordhau.com/forum/topic/10348/dedicated-server-hosting-guide-linux/?page=1)
 You'll need to run the server once before the Mordhau/Saved/Config/LinuxServer  folder is available
 
-### Default Map Variable
+## Default Map Variable
+
 By default the game always starts the same game map and mode.  Change this variable to start the server wth your choice of map and mode. For example , Grad/HRD_Grad OR TaigaMap/FL_Taiga
 
 Map Types
diff --git a/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json b/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json
index 98bba824..184da24f 100644
--- a/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json
+++ b/game_eggs/steamcmd_servers/mordhau/egg-mordhau-wine.json
@@ -1,23 +1,30 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-09-13T10:48:47-04:00",
+    "exported_at": "2021-08-28T18:01:27+00:00",
     "name": "Mordhau Wine",
     "author": "parker@parkervcp.com",
     "description": "Mordhau is a multiplayer medieval hack 'n slash video game, developed by Slovenian independent studio Triternion, with a prominent aspect of skill-based competitive play and customization.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5",
-    "startup": "xvfb-run --auto-servernum --server-args='-screen 0 1024x768x16:32' wine MordhauServer.exe {{DEFAULT_MAP}} -log MaxSlots={{MAX_PLAYERS}} -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}} -Beaconport={{BEACON_PORT}}",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_wine"
+    ],
+    "file_denylist": [],
+    "startup": "xvfb-run --auto-servernum wine MordhauServer.exe {{DEFAULT_MAP}} -log MaxSlots={{MAX_PLAYERS}} -USEALLAVAILABLECORES -Port={{SERVER_PORT}} -QueryPort={{QUERY_PORT}} -Beaconport={{BEACON_PORT}}",
     "config": {
-        "files": "{\r\n    \"Mordhau\/Saved\/Config\/WindowsServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"AdminPassword=\": \"AdminPassword={{server.build.env.ADMIN_PASSWORD}}\",\r\n            \"ServerName=\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n            \"ServerPassword=\": \"ServerPassword={{server.build.env.GAME_PASSWORD}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"UpdateGameServer completed (bWasSuccessful: 1)\"\r\n}",
+        "files": "{\r\n    \"Mordhau\/Saved\/Config\/WindowsServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"AdminPassword\": \"AdminPassword={{server.build.env.ADMIN_PASSWORD}}\",\r\n            \"ServerName\": \"ServerName={{server.build.env.SERVER_NAME}}\",\r\n            \"ServerPassword\": \"ServerPassword={{server.build.env.GAME_PASSWORD}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\"done\": \"Session GameSession successfully created\"}",
         "logs": "{}",
         "stop": "^C"
     },
     "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\nDEBIAN_FRONTEND=noninteractive\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\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\nexport DEBIAN_FRONTEND=noninteractive\r\n\r\napt -y update\r\ndpkg --add-architecture i386\r\napt -y --no-install-recommends install curl lib32gcc1 ca-certificates gnupg wget software-properties-common\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\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} ${INSTALL_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## Mordhau specific because reasons\r\ncd \/tmp\r\n\r\n## install latest wine\r\nwget -nc https:\/\/dl.winehq.org\/wine-builds\/winehq.key\r\napt-key add winehq.key\r\necho \"deb https:\/\/dl.winehq.org\/wine-builds\/debian\/ buster main\" >> \/etc\/apt\/sources.list\r\napt update\r\n\r\n## libfaudio needed to install wine\r\nwget -nc https:\/\/download.opensuse.org\/repositories\/Emulators:\/Wine:\/Debian\/Debian_10\/amd64\/libfaudio0_20.01-0~buster_amd64.deb\r\nwget -nc https:\/\/download.opensuse.org\/repositories\/Emulators:\/Wine:\/Debian\/Debian_10\/i386\/libfaudio0_20.01-0~buster_i386.deb\r\n\r\napt install -y .\/libfaudio0_20.01-0~buster_*\r\n\r\n## install wine, cabextract, and xvfb for winetricks\r\napt install -y --install-recommends winehq-stable cabextract xvfb\r\n\r\nexport WINEPREFIX=\/mnt\/server\/.wine\r\nexport WINEDLLOVERRIDES=\"mscoree,mshtml=\"\r\nexport DISPLAY=:0\r\nexport DISPLAY_WIDTH=1024\r\nexport DISPLAY_HEIGHT=768\r\nexport DISPLAY_DEPTH=16\r\nexport AUTO_UPDATE=1\r\nexport XVFB=1\r\n\r\n## install winetricks\r\nwget -q -O \/usr\/sbin\/winetricks https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks \\\r\n&& chmod +x \/usr\/sbin\/winetricks\r\n\r\n## install vc redistributable\r\nxvfb-run --auto-servernum winetricks -q vcrun2019\r\n\r\n## fix issues with startup.\r\nif [[ ! -d \".wine\/drive_c\/users\/container\/My Documents\" ]]; then\r\n    mkdir -p \"\/mnt\/server\/.wine\/drive_c\/users\/container\/My Documents\"\r\nfi",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -28,8 +35,8 @@
             "description": "",
             "env_variable": "SRCDS_APPID",
             "default_value": "629800",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|numeric"
         },
         {
@@ -37,8 +44,8 @@
             "description": "",
             "env_variable": "QUERY_PORT",
             "default_value": "27015",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|numeric|max:65535"
         },
         {
@@ -46,8 +53,8 @@
             "description": "Mordhau Beacon Port",
             "env_variable": "BEACON_PORT",
             "default_value": "15000",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|numeric|max:65535"
         },
         {
@@ -55,8 +62,8 @@
             "description": "Required for windows game server installs",
             "env_variable": "WINDOWS_INSTALL",
             "default_value": "1",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|boolean"
         },
         {
@@ -64,8 +71,8 @@
             "description": "",
             "env_variable": "ADMIN_PASSWORD",
             "default_value": "aP@55word",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -73,8 +80,8 @@
             "description": "",
             "env_variable": "SERVER_NAME",
             "default_value": "A Pterodactyl Hosted Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -82,8 +89,8 @@
             "description": "",
             "env_variable": "GAME_PASSWORD",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|string"
         },
         {
@@ -91,9 +98,36 @@
             "description": "",
             "env_variable": "DEFAULT_MAP",
             "default_value": "\/Game\/Mordhau\/Maps\/Contraband\/FFA_Contraband",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string"
+        },
+        {
+            "name": "Max Players",
+            "description": "Max Players for the server",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "24",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|numeric"
+        },
+        {
+            "name": "Auto Update",
+            "description": "Decide if you want the server to auto update",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "0",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|boolean"
+        },
+        {
+            "name": "Extra variables for install",
+            "description": "",
+            "env_variable": "EXTRA_FLAGS",
+            "default_value": "",
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json b/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json
index 2af72a7a..521870db 100644
--- a/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json
+++ b/game_eggs/steamcmd_servers/mordhau/egg-mordhau.json
@@ -8,7 +8,9 @@
     "name": "Mordhau",
     "author": "trey@chazx.cc",
     "description": "Mordhau is a multiplayer medieval hack 'n slash video game, developed by Slovenian independent studio Triternion, with a prominent aspect of skill-based competitive play and customization.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:game_mordhau"
     ],
diff --git a/game_eggs/steamcmd_servers/nmrih/README.md b/game_eggs/steamcmd_servers/nmrih/README.md
index 14a0589c..1d12d382 100644
--- a/game_eggs/steamcmd_servers/nmrih/README.md
+++ b/game_eggs/steamcmd_servers/nmrih/README.md
@@ -1,10 +1,11 @@
-# No More Room in Hell 
+# No More Room in Hell
 
 ## From their [Website](https://www.nomoreroominhell.com/)
 
 No More Room in Hell is the ultimate ruthless and unforgiving co-operative zombie survival experience on the Source Engine, delivering award winning survival horror gameplay with dozens of weapons and multiple game modes.
 
-### Server Ports
+## Server Ports
+
 NMRIH servers require 1 port to be open, the SourceTV port can also be opened for spectators.
 
 | Port      | default |
@@ -13,4 +14,3 @@ NMRIH servers require 1 port to be open, the SourceTV port can also be opened fo
 | SourceTV  | 27020   |
 
 ## Steam Download [SteamStore](https://store.steampowered.com/app/224260/No_More_Room_in_Hell/)
-
diff --git a/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json b/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json
index 2da69396..8a53664b 100644
--- a/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json
+++ b/game_eggs/steamcmd_servers/nmrih/egg-nmrih.json
@@ -8,7 +8,9 @@
     "name": "nmrih",
     "author": "avalongamecs@gmail.com",
     "description": "No More Room In Hell",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/pterodactyl\/core:source"
     ],
diff --git a/game_eggs/steamcmd_servers/onset/README.md b/game_eggs/steamcmd_servers/onset/README.md
index 274faf9e..bdd740a9 100644
--- a/game_eggs/steamcmd_servers/onset/README.md
+++ b/game_eggs/steamcmd_servers/onset/README.md
@@ -1,14 +1,18 @@
 # Onset
-From their [site](https://playonset.com/):  
-Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players. 
+
+From their [site](https://playonset.com/):
+Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players.
 
 ## Recommended server settings
+
 ### RAM
+
 This server requires about 100M to run.
 
-See the following - https://dev.playonset.com/wiki/DedicatedServer#Minimum_requirements_2
+See the following - <https://dev.playonset.com/wiki/DedicatedServer#Minimum_requirements_2>
 
 ### Disk
+
 This server uses about 50M of disk.
 
 ## Server Ports
@@ -17,4 +21,4 @@ This server uses about 50M of disk.
 |-------|---------|
 | Game  | 7777    |
 | Query | 7776    |
-| file  | 7775    |
\ No newline at end of file
+| file  | 7775    |
diff --git a/game_eggs/steamcmd_servers/onset/egg-onset.json b/game_eggs/steamcmd_servers/onset/egg-onset.json
index 5bdd099a..8fea938e 100644
--- a/game_eggs/steamcmd_servers/onset/egg-onset.json
+++ b/game_eggs/steamcmd_servers/onset/egg-onset.json
@@ -1,17 +1,24 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-12-12T18:56:28-05:00",
+    "exported_at": "2022-01-20T12:56:32-05:00",
     "name": "Onset",
     "author": "parker@parkervcp.com",
     "description": "Onset is an open world multiplayer sandbox without predefined goals. Create and host your very own experience in Onset using scripting functions. Whether that is Roleplay, Cops and Robbers or classic Freeroam. Or just enjoy the different gamemodes created by other players.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source"
+    ],
+    "file_denylist": [],
     "startup": ".\/OnsetServer --noinput",
     "config": {
-        "files": "{\r\n    \"server_config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"ipaddress\": \"0.0.0.0\",\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"servername\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"password\":\"{{server.build.env.SERVER_PASSWORD}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Entering simulation\",\r\n    \"userInteraction\": []\r\n}",
+        "files": "{\r\n    \"server_config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"ipaddress\": \"0.0.0.0\",\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"servername\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"password\": \"{{server.build.env.SERVER_PASSWORD}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Entering simulation\"\r\n}",
         "logs": "{}",
         "stop": "^C"
     },
@@ -28,8 +35,8 @@
             "description": "ARK steam app id for auto updates. Leave blank to avoid auto update.",
             "env_variable": "SRCDS_APPID",
             "default_value": "1204170",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -37,8 +44,8 @@
             "description": "required to load server libraries.",
             "env_variable": "LD_LIBRARY_PATH",
             "default_value": ".",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -46,8 +53,8 @@
             "description": "This flag will auto update the server on restart. (default is 1) \r\n\r\nSet to 1 to update\r\nSet to 0 to no update",
             "env_variable": "AUTO_UPDATE",
             "default_value": "1",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         }
     ]
diff --git a/game_eggs/steamcmd_servers/pavlov_vr/README.md b/game_eggs/steamcmd_servers/pavlov_vr/README.md
index 9c475577..b8730b09 100644
--- a/game_eggs/steamcmd_servers/pavlov_vr/README.md
+++ b/game_eggs/steamcmd_servers/pavlov_vr/README.md
@@ -1,22 +1,29 @@
 # Pavlov VR
+
 Pavlov VR is a multiplayer shooter in VR with heavy focus on community features. Realistic reloading features and fast paced combat as part of the core experience.
 
 ## Recommended server settings
+
 ### Minimum RAM
+
 This server requires about 2048M to run. A 3.2 GHz core will support approximately 24 players. Since Pavlov VR is single threaded, faster clockspeeds will mean higher performance.
 
 ### Tickrate
+
 For stable results, please use a minimum of 50 and a maximum of 120.
 
 ### Multiple Servers on the same host
-If you are running multiple servers and have set additional ports (see http://wiki.pavlov-vr.com/index.php?title=Dedicated_server#Running_multiple_servers_on_one_host) then you need to allow access to the defined port plus the port 400 higher. So if you use 7000 as your port, then UDP 7000 and 7400 need to be open. 
 
-For additional help, please see the following - http://wiki.pavlov-vr.com/index.php?title=Dedicated_server
+If you are running multiple servers and have set additional ports (see <http://wiki.pavlov-vr.com/index.php?title=Dedicated_server#Running_multiple_servers_on_one_host>) then you need to allow access to the defined port plus the port 400 higher. So if you use 7000 as your port, then UDP 7000 and 7400 need to be open.
+
+For additional help, please see the following - <http://wiki.pavlov-vr.com/index.php?title=Dedicated_server>
 
 ### Steam Workshop
+
 When downloading a large map from the steam workshop make sure your node has enough RAM assigned to store the map files in its tmpfs! This requires you to modify your wings configuration to have the tmpfs_size value increased.
 
 ## Server Ports
+
 | Port  | default |
 |-------|---------|
 | Game  |  7777   |
diff --git a/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json b/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json
index 73f96dc7..8a51b857 100644
--- a/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json
+++ b/game_eggs/steamcmd_servers/pavlov_vr/egg-pavlov-v-r.json
@@ -8,7 +8,9 @@
     "name": "Pavlov VR",
     "author": "admin@devil.wtf",
     "description": "Pavlov VR is a multiplayer shooter in VR with heavy focus on community features. Realistic reloading features and fast paced combat as part of the core experience. Play the #1 most popular VR shooter on PC today.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_source"
     ],
@@ -74,4 +76,4 @@
             "rules": "required|boolean"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/pixark/README.md b/game_eggs/steamcmd_servers/pixark/README.md
index 1183417c..7c0999b4 100644
--- a/game_eggs/steamcmd_servers/pixark/README.md
+++ b/game_eggs/steamcmd_servers/pixark/README.md
@@ -2,7 +2,8 @@
 
 Welcome to PixARK, a vast, wild world filled with vicious dinosaurs, magical creatures and endless adventure! To survive in this mysterious land, you must tame creatures both ferocious and cuddly, craft high tech and magical tools, and build your own base out of cubes.
 
-### Server Ports
+## Server Ports
+
 PixARK requires 4 ports
 
 | Port  | default |
@@ -10,4 +11,4 @@ PixARK requires 4 ports
 | Game  | 27015   |
 | Query | 27016   |
 | RCON  | 27017   |
-| cube  | 27018   |
\ No newline at end of file
+| cube  | 27018   |
diff --git a/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json b/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json
index d6aa04e8..9c93cc3d 100644
--- a/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json
+++ b/game_eggs/steamcmd_servers/pixark/egg-pix-a-r-k.json
@@ -8,7 +8,9 @@
     "name": "PixARK",
     "author": "hello@venatus.digital",
     "description": "A simple Docker container with Wine to run PixARK using Pterodactyl Panel",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-source"
     ],
@@ -109,4 +111,4 @@
             "rules": "required|string|max:30"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/post_scriptum/README.md b/game_eggs/steamcmd_servers/post_scriptum/README.md
index 7c963a86..18b93f39 100644
--- a/game_eggs/steamcmd_servers/post_scriptum/README.md
+++ b/game_eggs/steamcmd_servers/post_scriptum/README.md
@@ -6,9 +6,8 @@ Post Scriptum is a WW2-themed first-person tactical shooter that provides an aut
 
 Post Scriptum requires Game and Query port to function, while RCON port is only required if you want to use RCON.
 
-
-| Port        | default |
-|-------------|---------|
-| Game        | 10027    |
-| Query     | 10037    |
-| RCON (optional)     | 21114    |
+| Port            | default |
+|-----------------|---------|
+| Game            | 10027   |
+| Query           | 10037   |
+| RCON (optional) | 21114   |
diff --git a/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json b/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json
index c31662aa..df3b95df 100644
--- a/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json
+++ b/game_eggs/steamcmd_servers/post_scriptum/egg-post-scriptum.json
@@ -8,7 +8,9 @@
     "name": "Post Scriptum",
     "author": "admin@softwarenoob.com",
     "description": "Post Scriptum is a WW2-themed first-person tactical shooter that provides an authentic WWII combat experience. Focusing on historical accuracy, large-scale battles, and a challenging battlefield demands an intense need for cohesion, communication, and teamwork.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/pterodactyl\/core:source"
     ],
diff --git a/game_eggs/steamcmd_servers/project_zomboid/README.md b/game_eggs/steamcmd_servers/project_zomboid/README.md
index 9a6c9389..6f6f9c32 100644
--- a/game_eggs/steamcmd_servers/project_zomboid/README.md
+++ b/game_eggs/steamcmd_servers/project_zomboid/README.md
@@ -7,7 +7,8 @@ Project Zomboid is the ultimate in zombie survival. Alone or in MP: you loot, bu
 Project Zomboid requires one port for Steam and an additional **one port per player**.  Additional ports are allocated as they connect.
 
 For example, when configured with a base allocation of 27016:
-```
+
+```log
 Zomboid Steam Server started, ports 27016 and 27016 must be open on the router
 Connected new client kubi ID # 0 and assigned DL port 27017
 Connected new client kubi2 ID # 1 and assigned DL port 27018
diff --git a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json
index 92910441..946d9747 100644
--- a/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json
+++ b/game_eggs/steamcmd_servers/project_zomboid/egg-project-zomboid.json
@@ -1,24 +1,31 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-06-06T11:23:23-07:00",
+    "exported_at": "2021-12-29T14:38:26+00:00",
     "name": "Project Zomboid",
     "author": "iamkubi@gmail.com",
     "description": "Project Zomboid is an open world survival horror video game in alpha stage development by British and Canadian independent developer, The Indie Stone. The game is set in a post apocalyptic, zombie infested world where the player is challenged to survive for as long as possible before inevitably dying.",
-    "image": "quay.io\/pterodactyl\/core:source",
-    "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -servername \\\"{{SERVER_NAME}}\\\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/pterodactyl\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": "\/home\/container\/start-server.sh -port {{SERVER_PORT}} -steamport1 {{STEAM_PORT}} -cachedir=\/home\/container\/.cache -servername \\\"{{SERVER_NAME}}\\\" -adminusername {{ADMIN_USER}} -adminpassword \"{{ADMIN_PASSWORD}}\"",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"SERVER STARTED\",\r\n    \"userInteraction\": []\r\n}",
+        "startup": "{\r\n    \"done\": \"SERVER STARTED\"\r\n}",
         "logs": "{}",
-        "stop": "^C"
+        "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "apt update\r\napt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 380870 +quit\r\nmkdir -p \/mnt\/server\/.steam\/sdk32\r\ncp -v \/mnt\/server\/steam\/linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/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# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\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 found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD  flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_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\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -28,8 +35,8 @@
             "description": "Name of the server",
             "env_variable": "SERVER_NAME",
             "default_value": "Project Zomboid Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:64"
         },
         {
@@ -37,8 +44,8 @@
             "description": "Username for the admin account",
             "env_variable": "ADMIN_USER",
             "default_value": "admin",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -46,8 +53,8 @@
             "description": "Password for the admin account",
             "env_variable": "ADMIN_PASSWORD",
             "default_value": "password",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:32"
         },
         {
@@ -55,8 +62,8 @@
             "description": "Sets the SteamPort1 option",
             "env_variable": "STEAM_PORT",
             "default_value": "8766",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -64,9 +71,36 @@
             "description": "Maximum players to allow",
             "env_variable": "MAX_PLAYERS",
             "default_value": "10",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "PZ Steam App ID",
+            "description": "PZ Steam App ID",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "380870",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Steam Beta Branch [requires reinstall]",
+            "description": "Beta branch to install, such as b41multiplayer. Leave blank to install normal branch",
+            "env_variable": "SRCDS_BETAID",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "nullable|string|max:64"
+        },
+        {
+            "name": "Steam Auto Update",
+            "description": "Enable or disable auto-update on startup. 0 to disable and 1 to enable.",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "0",
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/quake_live/README.md b/game_eggs/steamcmd_servers/quake_live/README.md
index dba53fb5..e665d67e 100644
--- a/game_eggs/steamcmd_servers/quake_live/README.md
+++ b/game_eggs/steamcmd_servers/quake_live/README.md
@@ -1,13 +1,15 @@
 # Quake Live
-A first-person shooter video game by id Software. It is an updated version of Quake III Arena that was originally designed 
-as a free-to-play game launched via a web browser plug-in. On September 17, 2014, the game was re-launched as a standalone 
+
+A first-person shooter video game by id Software. It is an updated version of Quake III Arena that was originally designed
+as a free-to-play game launched via a web browser plug-in. On September 17, 2014, the game was re-launched as a standalone
 title on Steam.
 
-Quake Live was previously a free-to-play game, with subscription options offering additional arenas, game types and game 
-server options. As of October 27, 2015, the game is no longer free and must be purchased, and the subscription options 
+Quake Live was previously a free-to-play game, with subscription options offering additional arenas, game types and game
+server options. As of October 27, 2015, the game is no longer free and must be purchased, and the subscription options
 were dropped.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default   |
diff --git a/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json b/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json
index 07e4dc75..a74a28d0 100644
--- a/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json
+++ b/game_eggs/steamcmd_servers/quake_live/egg-quake-live.json
@@ -7,7 +7,9 @@
     "name": "Quake Live",
     "author": "patz.michael@gmail.com",
     "description": "Quake Live is a first-person shooter video game by id Software. It is an updated version of Quake III Arena that was originally designed as a free-to-play game launched via a web browser plug-in. On September 17, 2014, the game was re-launched as a standalone title on Steam.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "image": "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source",
     "startup": ".\/qzeroded.x64  +set net_port \"{{SERVER_PORT}}\" +set sv_hostname \"{{SERVER_NAME}}\" +set sv_serverType \"{{SERVER_TYPE}}\" +set g_password \"{{PASSWORD}}\" +sv_fps \"{{FPS}}\"",
     "config": {
@@ -70,4 +72,4 @@
             "rules": "required|numeric"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/rising_world/README.md b/game_eggs/steamcmd_servers/rising_world/README.md
index c2800974..f30a88ca 100644
--- a/game_eggs/steamcmd_servers/rising_world/README.md
+++ b/game_eggs/steamcmd_servers/rising_world/README.md
@@ -1,10 +1,13 @@
 # Rising World
+
 Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.
 
-### Server Ports
+## Server Ports
+
 Rising World requires up to 7 ports.
- * The RCON port is optional, but is enabled by default.
- * Game ports require both TCP and UDP
+
+* The RCON port is optional, but is enabled by default.
+* Game ports require both TCP and UDP
 
 | Port    | default       |
 |---------|---------------|
diff --git a/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json b/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json
index a347d7fe..c0943eb7 100644
--- a/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json
+++ b/game_eggs/steamcmd_servers/rising_world/egg-rising-world.json
@@ -8,7 +8,9 @@
     "name": "Rising World",
     "author": "info@goover.de",
     "description": "Rising World is a voxel based open-world sandbox game, featuring a procedurally generated world, playable in single and multi-player.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/pterodactyl\/core:java"
     ],
@@ -92,4 +94,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/risk_of_rain_2/README.md b/game_eggs/steamcmd_servers/risk_of_rain_2/README.md
index b8150b97..f14ec862 100644
--- a/game_eggs/steamcmd_servers/risk_of_rain_2/README.md
+++ b/game_eggs/steamcmd_servers/risk_of_rain_2/README.md
@@ -3,6 +3,7 @@
 Escape a chaotic alien planet by fighting through hordes of frenzied monsters – with your friends, or on your own.
 
 ## Minimum Specifications
+
 - At least 1GB RAM
 - Minimum 4GB hard disk space
 
diff --git a/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json b/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json
index 664e617e..cc578645 100644
--- a/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json
+++ b/game_eggs/steamcmd_servers/risk_of_rain_2/egg-risk-of-rain2.json
@@ -8,7 +8,9 @@
     "name": "Risk of Rain 2",
     "author": "alex.chang-lam@protonmail.com",
     "description": "Risk of Rain 2 dedicated server.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5"
     ],
@@ -83,4 +85,4 @@
             "rules": "required|numeric"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md b/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md
index 27532983..d2e8763b 100644
--- a/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md
+++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/README.md
@@ -1,17 +1,20 @@
-### Rust Autowipe
+# Rust Autowipe
+
 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.
 
-Adds variables to wipe files based on a list you set.
+Adds variables to wipe files based on a list you set. Reinstall to perform the wipe.
 
-The variable `REGEN_SERVER` was added, default 0 set to 1 to generate a random seed and remove old files
+The variable `REGEN_SERVER` was added, default 0, set to 1 to generate a random seed and remove old files on reinstall.
 
 Files listed in the `REMOVE_FILES` variabe, space separated, will be removed.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 The server requires at least 4096MB to run properly.
 This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server.
 
 | Port    | default |
diff --git a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json
index 6bb60689..20c9d92d 100644
--- a/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json
+++ b/game_eggs/steamcmd_servers/rust/rust_autowipe/egg-rust-autowipe.json
@@ -1,24 +1,31 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-06-29T18:44:15-04:00",
+    "exported_at": "2021-09-19T08:13:28-04:00",
     "name": "Rust Autowipe",
     "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.",
-    "image": "quay.io\/pterodactyl\/core:rust",
-    "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.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} {{ADDITIONAL_ARGS}}\"",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/pterodactyl\/core:rust"
+    ],
+    "file_denylist": [],
+    "startup": "\".\/RustDedicated -batchmode +server.port {{SERVER_PORT}} +server.identity \"rust\" +rcon.ip 0.0.0.0 +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.worldsize \\\"{{WORLD_SIZE}}\\\" +server.seed \\\"$( if [ -f seed.txt ] && [[ ${WORLD_SEED} == \"0\" ]]; then printf %s $(cat seed.txt); else printf %s '${WORLD_SEED}'; fi )\\\" +server.maxplayers {{MAX_PLAYERS}} +rcon.password \\\"{{RCON_PASS}}\\\" +server.saveinterval {{SAVEINTERVAL}} {{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\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\r\n\r\nif [ ${REGEN_SERVER} == \"1\" ]; then\r\n    cd \/mnt\/server\/\r\n    rm -rf ${REMOVE_FILES}\r\nfi\r\n\r\nif [ $WORLD_SEED == \"0\" ]; then\r\n    if [ ! -f \/mnt\/server\/seed.txt ]; then\r\n        rm -sf \/mnt\/server\/seed.txt\r\n    fi\r\n    \r\n    cat \/dev\/urandom | tr -dc '1-9' | fold -w 5 | head -n 1 > \/mnt\/server\/seed.txt\r\nfi",
-            "container": "ubuntu:18.04",
+            "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
     },
@@ -28,8 +35,8 @@
             "description": "The name of your server in the public server list.",
             "env_variable": "HOSTNAME",
             "default_value": "A Rust Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:40"
         },
         {
@@ -37,8 +44,8 @@
             "description": "Set whether you want the server to use and auto update OxideMod or not. Valid options are \"1\" for true and \"0\" for false.",
             "env_variable": "OXIDE",
             "default_value": "0",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|boolean"
         },
         {
@@ -46,8 +53,8 @@
             "description": "The world file for Rust to use.",
             "env_variable": "LEVEL",
             "default_value": "Procedural Map",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -55,8 +62,8 @@
             "description": "The description under your server title. Commonly used for rules & info. Use \\n for newlines.",
             "env_variable": "DESCRIPTION",
             "default_value": "Powered by Pterodactyl",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -64,8 +71,8 @@
             "description": "The URL for your server. This is what comes up when clicking the \"Visit Website\" button.",
             "env_variable": "SERVER_URL",
             "default_value": "http:\/\/pterodactyl.io",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|url"
         },
         {
@@ -73,8 +80,8 @@
             "description": "The world size for a procedural map.",
             "env_variable": "WORLD_SIZE",
             "default_value": "3000",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -82,8 +89,8 @@
             "description": "The seed for a procedural map.",
             "env_variable": "WORLD_SEED",
             "default_value": "0",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|string"
         },
         {
@@ -91,8 +98,8 @@
             "description": "The maximum amount of players allowed in the server at once.",
             "env_variable": "MAX_PLAYERS",
             "default_value": "40",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -100,8 +107,8 @@
             "description": "The header image for the top of your server listing.",
             "env_variable": "SERVER_IMG",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|url"
         },
         {
@@ -109,8 +116,8 @@
             "description": "Port for RCON connections.",
             "env_variable": "RCON_PORT",
             "default_value": "28016",
-            "user_viewable": 1,
-            "user_editable": 0,
+            "user_viewable": true,
+            "user_editable": false,
             "rules": "required|integer"
         },
         {
@@ -118,17 +125,17 @@
             "description": "RCON access password.",
             "env_variable": "RCON_PASS",
             "default_value": "CHANGEME",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|max:64"
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|regex:\/^[\\w.-]*$\/|max:64"
         },
         {
             "name": "Save Interval",
             "description": "Sets the server\u2019s auto-save interval in seconds.",
             "env_variable": "SAVEINTERVAL",
             "default_value": "60",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -136,26 +143,26 @@
             "description": "Add additional startup parameters to the server.",
             "env_variable": "ADDITIONAL_ARGS",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|string"
         },
         {
             "name": "Regen Server",
-            "description": "If the server should have its files removed and regenerate the server seed.",
+            "description": "If the server should have its files removed and regenerate the server seed on reinstall.",
             "env_variable": "REGEN_SERVER",
             "default_value": "0",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|boolean"
         },
         {
             "name": "Files to remove",
-            "description": "A space separated list of files to remove when regenerating the server.",
+            "description": "A space-separated list of files to remove when regenerating the server on reinstall.",
             "env_variable": "REMOVE_FILES",
             "default_value": "server\/rust\/player.deaths.*.db server\/rust\/player.identities.*.db server\/rust\/player.states.*.db server\/rust\/player.tokens.db proceduralmap.*.*.*.map server\/rust\/proceduralmap.*.*.*.sav oxide\/data\/Kits_Data.json oxide\/data\/NTeleportationHome.json oxide\/data\/ServerRewards\/player_data.json oxide\/data\/PTTracker\/playtime_data.json",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         }
     ]
diff --git a/game_eggs/steamcmd_servers/rust/rust_staging/README.md b/game_eggs/steamcmd_servers/rust/rust_staging/README.md
index 7b577286..f1742a66 100644
--- a/game_eggs/steamcmd_servers/rust/rust_staging/README.md
+++ b/game_eggs/steamcmd_servers/rust/rust_staging/README.md
@@ -1,18 +1,22 @@
-### Rust Staging Branch
+# Rust Staging Branch
+
 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.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 The server requires at least 4096MB to run properly.
 This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less.
 
-### Modding warning
+## Modding warning
+
 Due to Oxide/uMod not supporting the staging branch, you will not be able to Mod this server.
 
 Wulf (Community Admin on Oxidemod/uMod):
 
 "We only release builds for the release/public branch of Rust, so if you'd like to use it on any other branch, you'd need to manually patch it yourself using our patcher tool founder under the Snapshots repo. To switch a different Rust branch, just use the -beta tag with SteamCMD and the branch name."
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server.
 
 | Port    | default |
diff --git a/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json b/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json
index fb2a13c7..5f1b6642 100644
--- a/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json
+++ b/game_eggs/steamcmd_servers/rust/rust_staging/egg-rust-staging.json
@@ -8,7 +8,9 @@
     "name": "Rust Staging",
     "author": "root@smc.li",
     "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"
     ],
diff --git a/game_eggs/steamcmd_servers/satisfactory/README.md b/game_eggs/steamcmd_servers/satisfactory/README.md
new file mode 100644
index 00000000..79b49fed
--- /dev/null
+++ b/game_eggs/steamcmd_servers/satisfactory/README.md
@@ -0,0 +1,191 @@
+# Satisfactory
+
+***Updating your Egg?**: Ensure any existing servers have the latest Startup Command, new Startup Variables are set, **and you reinstall server!***
+___
+
+## Authors / Contributors
+
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+    <tr>
+        <td align="center">
+            <a href="https://github.com/lilkingjr1">
+                <img src="https://avatars.githubusercontent.com/u/4533989" width="50px;" alt=""/><br /><sub><b>Red-Thirten</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=lilkingjr1" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=lilkingjr1" title="Maintains">🔨</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/iamkubi">
+                <img src="https://avatars.githubusercontent.com/u/6176191" width="50px;" alt=""/><br /><sub><b>Kubi</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=iamkubi" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=iamkubi" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/matthewpi">
+                <img src="https://avatars.githubusercontent.com/u/26559841" width="50px;" alt=""/><br /><sub><b>matthewpi</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=matthewpi" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=matthewpi" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/Software-Noob">
+                <img src="https://avatars.githubusercontent.com/u/10975908" width="50px;" alt=""/><br /><sub><b>Software-Noob</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=Software-Noob" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=Software-Noob" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/Zarklord">
+                <img src="https://avatars.githubusercontent.com/u/1622280" width="50px;" alt=""/><br /><sub><b>Zarklord</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=Zarklord" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=Zarklord" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/AlienXAXS">
+                <img src="https://avatars.githubusercontent.com/u/1773445" width="50px;" alt=""/><br /><sub><b>AlienXAXS</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=AlienXAXS" title="Contributor">💡</a>
+        </td>
+    </tr>
+</table>
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+
+___
+
+### Game Description
+
+From Coffee Stain's [Website](https://www.satisfactorygame.com/):
+> Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven!
+
+___
+
+### Egg Capabilities
+
+- Configuration of the Server Query, Beacon, and Game ports.
+- Configurable to automatically check for server updates on start via SteamCMD. Forcing validation is also configurable.
+- *[Experimental]* Max player configuration.
+- Autosave amount and interval configuration.
+- Disable crash reporting if desired.
+- ...and other advanced networking and server branch configurable settings.
+
+___
+
+### Server Ports
+
+- Default server ports are listed below, but all three ports can be changed freely.
+- **Note:** The Primary/Default/Game Port for your server in Pterodactyl will be Satisfactory's `-Port=????` game port, even though clients will **connect with the Query port**.
+- It is recommended to distance ports of other running Satisfactory servers in Pterodactyl by **increments of 100** (it is currently unknown what the minimum increment is, but an increment of +1 caused cross-server talk in testing). Also, your internal ports **must match** your external ports on your network (ie. you can't have an external port of 7778 forwarded to your 7777 internal port; they must match).
+- ***All three ports are required to be open/allocated for normal server behavior!***
+
+| Port | Default (UDP) |
+|---------|---------|
+| **Game (Primary Port in Pterodactyl)** | 7777 |
+| Beacon | 15000 |
+| Server Query | 15777 |
+
+___
+
+### Installation/System Requirements
+
+|  | Bare Minimum | Recommended |
+|---------|---------|---------|
+| Processor | Recent x86/64 (AMD/Intel) processor. No 32 bit or ARM support. | Favours higher single-core performance over multiple cores. |
+| RAM | 4096 MiB | 6144-8192 MiB (especially for 4 players or large save files) |
+| Storage | 5 GB | 7-10 GB (or more, depending on save size or frequency) |
+| Network | 0.512 Mbit/s | 1-5 Mbit/s ([may require server *and* client config tweeks](https://satisfactory.fandom.com/wiki/Multiplayer#Temporary_lag_solution)) |
+| Host OS | Most stable Linux OS branches should work | Using the latest kernel version for your installed OS can prevent some edge-case installation/boot issues. |
+| Game Ownership | Not required to start. | Required to fully "initialize" (see [Server Initialization](#server-initialization) below) |
+
+___
+
+### Server Initialization
+
+For a server to be fully "initialized", a client who owns the game must log into the server to "claim" it and create an administrator password. Then, a new session can be created via the "Create Game" tab in-game, or an existing save file can be uploaded (see [Save Files](#save-files) below).
+
+Misc. settings listed below can be configured by an admin client via the game's "Server Settings" tab, and are currently **not** set via the Egg:
+
+- Server Password
+- Admin Password
+- Auto-Save on Player Disconnect
+- Pause When No Players Online
+- ...and possibly more as the client's UI is developed further for more configuration options.
+
+___
+
+### Save Files
+
+An existing save file (including single-player saves) can currently be uploaded to the server via two different methods:
+- "Manage Saves" tab via a client in-game (Recommended)
+- Manually via the File Manager or SFTP
+
+Save files are located in this directory:
+
+```md
+/home/container/.config/Epic/FactoryGame/Saved/SaveGames/server
+```
+
+*Note: A manually uploaded save will only load if it is (a.) loaded manually via the "Manage Saves" tab in-game, (b.) it is the only save file present, or (c.) its existing session name (not its file name) matches the existing save's session name *and* has the most recent time stamp.*
+
+***Warning:*** Stopping the server **does not** currently save your game! Ensure it is saved before stopping the server.
+
+If you have forgotten your administrator password or would generally like to reset your server as if it were new, you can delete the following file:
+
+```md
+/home/container/.config/Epic/FactoryGame/Saved/SaveGames/ServerSettings.<your_server_query_port>
+```
+
+___
+
+### Console Commands
+
+As of v0.5.1.2, the console tab in the client server manager is the only way to execute commands. Entering commands via Pterodactyl do nothing.
+
+[List of known commands can be found via the Wiki.](https://satisfactory.fandom.com/wiki/Dedicated_servers#Console_commands)
+___
+
+### Errors/Warnings
+
+The following errors or warnings you see in the console can safely be ignored:
+
+```log
+steamclient.so: cannot open shared object file: No such file or directory
+[S_API] SteamAPI_Init(): Loaded '/home/container/.steam/sdk64/steamclient.so' OK.  (First tried local 'steamclient.so')
+LogSteamShared: Warning: Steam Dedicated Server API failed to initialize.
+```
+
+The local file of 'steamclient.so' was attempted to be loaded, but could not because it is not present, causing the warning message. However, the backup `/home/container/.steam/sdk64/steamclient.so` is loaded successfully (this is the correct behavior according to the [Wiki](https://satisfactory.fandom.com/wiki/Dedicated_servers#SteamAPI_Init.28.29:_Sys_LoadModule_filed_to_load:_.2Fpath.2Fto.2F.steam.2Fsdk64.2Fsteamclient.so)).
+
+```log
+Warning: failed to init SDL thread priority manager: SDL not found
+```
+
+This is a common error with Steam related software on Linux, but can safely be ignored.
+
+```log
+...Error: Couldn't find file for package...
+```
+
+```log
+...Error: Navmesh bounds are too large!...
+```
+
+```log
+...Warning: NiagaraSystem...
+```
+
+```log
+LogStreaming: Warning: Failed to read file '../../../FactoryGame/Saved/SaveGames/GameAnalytics.sav' error.
+```
+
+These seem to be common error messages with the current experimental version of the game.
diff --git a/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json
new file mode 100644
index 00000000..3d8f7889
--- /dev/null
+++ b/game_eggs/steamcmd_servers/satisfactory/egg-satisfactory.json
@@ -0,0 +1,150 @@
+{
+    "_comment": "Pterodactyl Satisfactory Egg ~ Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord ~ 2021-11-29",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "name": "Satisfactory",
+    "author": "rehlmgaming@gmail.com",
+    "description": "Satisfactory is a first-person open-world factory building game with a dash of exploration and combat. Play alone or with friends, explore an alien planet, create multi-story factories, and enter conveyor belt heaven!",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
+    "startup": ".\/Engine\/Binaries\/Linux\/UE4Server-Linux-Shipping FactoryGame ?listen -Port={{SERVER_PORT}} -ServerQueryPort={{QUERY_PORT}} -BeaconPort={{BEACON_PORT}} -multihome=0.0.0.0",
+    "config": {
+        "files": "{\r\n    \"FactoryGame\/Saved\/Config\/LinuxServer\/Game.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"MaxPlayers\": \"MaxPlayers={{server.build.env.MAX_PLAYERS}}\"\r\n        }\r\n    },\r\n    \"FactoryGame\/Saved\/Config\/LinuxServer\/Engine.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"mNumRotatingAutosaves\": \"mNumRotatingAutosaves={{server.build.env.NUM_AUTOSAVES}}\",\r\n            \"bImplicitSend\": \"bImplicitSend={{server.build.env.UPLOAD_CRASH_REPORT}}\",\r\n            \"InitialConnectTimeout\": \"InitialConnectTimeout={{server.build.env.INIT_CONNECT_TIMEOUT}}\",\r\n            \"ConnectionTimeout\": \"ConnectionTimeout={{server.build.env.CONNECT_TIMEOUT}}\"\r\n        }\r\n    },\r\n    \"FactoryGame\/Saved\/Config\/LinuxServer\/GameUserSettings.ini\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"mFloatValues\": \"mFloatValues=((\\\"FG.AutosaveInterval\\\", {{server.build.env.AUTOSAVE_INTERVAL}}))\",\r\n            \"mIntValues\": \"mIntValues=((\\\"FG.NetworkQuality\\\", {{server.build.env.NETWORK_QUALITY}}))\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Engine Initialization\"\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n\r\n# File: Pterodactyl Satisfactory Egg - egg-satisfactory.json\r\n# Authors: Red-Thirten, Kubi, matthewp, Software-Noob, and Zarklord\r\n# Date: 2021\/11\/29\r\n# License: MIT License\r\n\r\n## Download and install SteamCMD\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\nmkdir -p \/mnt\/server\/steamcmd\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n# Install game server using SteamCMD\r\n.\/steamcmd.sh +force_install_dir \/mnt\/server +login anonymous +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) validate +exit\r\n\r\n# Set up 32 and 64 bit libraries\r\nmkdir -p \/mnt\/server\/.steam\/sdk{32,64}\r\ncp -v linux32\/steamclient.so \/mnt\/server\/.steam\/sdk32\/steamclient.so\r\ncp -v linux64\/steamclient.so \/mnt\/server\/.steam\/sdk64\/steamclient.so\r\n\r\n## Satisfactory setup\r\n# Check for successful installation and make the core binary executable.\r\ncd \/mnt\/server\/Engine\/Binaries\/Linux\r\nif [[ ! -f UE4Server-Linux-Shipping ]]; then\r\n    echo -e \"\\n\\nSteamCMD failed to install the Satisfactory Dedicated Server!\"\r\n    echo -e \"\\tTry reinstalling the server again.\\n\"\r\n    exit 1\r\nelse\r\n    chmod +x UE4Server-Linux-Shipping\r\nfi\r\n\r\n# Make Config directory and default .ini files (since they are not initially present before first server start)\r\nmkdir -p \/mnt\/server\/FactoryGame\/Saved\/Config\/LinuxServer\/ && cd \"$_\"\r\n# Currently, this will delete & re-create certain .ini files during a re-install if they are already present.\r\n# While undesirable, this is required due to a current Pterodactyl ini config parser limitation.\r\n# When the patch to this limitation hits the production branch, this will be updated.\r\nrm -f Engine.ini Game.ini GameUserSettings.ini\r\n\r\necho -e '\\nCreating default \"Engine.ini\" configuration file...'\r\ncat > Engine.ini << EOF\r\n[\/Script\/FactoryGame.FGSaveSession]\r\nmNumRotatingAutosaves=${NUM_AUTOSAVES}\r\n\r\n[CrashReportClient]\r\nbImplicitSend=${UPLOAD_CRASH_REPORT}\r\n\r\n[\/Script\/OnlineSubsystemUtils.IpNetDriver]\r\nInitialConnectTimeout=${INIT_CONNECT_TIMEOUT}\r\nConnectionTimeout=${CONNECT_TIMEOUT}\r\nEOF\r\n\r\necho -e 'Creating default \"Game.ini\" configuration file...'\r\ncat > Game.ini << EOF\r\n[\/Script\/Engine.GameSession]\r\nMaxPlayers=${MAX_PLAYERS}\r\nEOF\r\n\r\necho -e 'Creating default \"GameUserSettings.ini\" configuration file...'\r\ncat > GameUserSettings.ini << EOF\r\n[\/Script\/FactoryGame.FGGameUserSettings]\r\nmIntValues=((\"FG.NetworkQuality\", ${NETWORK_QUALITY}))\r\nmFloatValues=((\"FG.AutosaveInterval\", ${AUTOSAVE_INTERVAL}))\r\nEOF\r\n\r\necho -e \"\\nSatisfactory Dedicated Server successfully installed!\\n\"",
+            "container": "ghcr.io\/pterodactyl\/installers:debian",
+            "entrypoint": "\/bin\/bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "[REQUIRED] Server Query Port",
+            "description": "This is the port that your clients will type in and use to connect to the lobby (not the game world). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended). This is also true for the Primary\/Game Port!",
+            "env_variable": "QUERY_PORT",
+            "default_value": "15777",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|integer|between:1024,65536"
+        },
+        {
+            "name": "[REQUIRED] Beacon Port",
+            "description": "This port provides a lightweight way for clients to contact a server and interact with it without committing to a normal game connection (likely used for client administration). Ensure this port matches your externally forwarded port, and is distanced from other running Satisfactory servers in Pterodactyl (increments of 100 are recommended).",
+            "env_variable": "BEACON_PORT",
+            "default_value": "15000",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|integer|between:1024,65536"
+        },
+        {
+            "name": "Automatic Updates",
+            "description": "Quickly checks for any server updates on startup, and updates if necessary. (1 Enable | 0 Disable)",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "boolean"
+        },
+        {
+            "name": "[Repair] Validate Server Files",
+            "description": "Leave empty (no value) for OFF or type \"true\" or \"1\" for ON. Validates all server files when Automatic Updates is enabled. Note: This will significantly increase server startup times, so it is recommended to only enable this when needed.",
+            "env_variable": "VALIDATE",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Autosave Interval",
+            "description": "How often, in seconds, the server should generate a new autosave (ex. 300 = 5 min). Keep in mind that shorter times mean that while the server will save the game more often, it also means a potential drop in server performance. NOTE: This overrides any \"FG.AutosaveInterval\" commands made to the console!",
+            "env_variable": "AUTOSAVE_INTERVAL",
+            "default_value": "300",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|numeric|min:1"
+        },
+        {
+            "name": "Number of Rotating Autosaves",
+            "description": "Number of session auto-saves for the server to keep before the oldest save is deleted and the others are moved down the list.",
+            "env_variable": "NUM_AUTOSAVES",
+            "default_value": "3",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer|min:0"
+        },
+        {
+            "name": "Upload Crash Reports",
+            "description": "Accepted values are \"true\" or \"false\". Determines if the server should upload any crash reports to the developer to help pinpoint issues for future patches.",
+            "env_variable": "UPLOAD_CRASH_REPORT",
+            "default_value": "true",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "[Experimental] Max Players",
+            "description": "[Requires server re-install to change default value!] The server and client are currently not optimized to support more than 4 players. However, you can override this value here at your own risk of poor performance.",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "4",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer|min:1"
+        },
+        {
+            "name": "[Advanced] Client Initial Connection Timeout",
+            "description": "Time in seconds to wait for a new client connection to be established before destroying the connection.",
+            "env_variable": "INIT_CONNECT_TIMEOUT",
+            "default_value": "30",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|numeric|min:1"
+        },
+        {
+            "name": "[Advanced] Client Established Connection Timeout",
+            "description": "Time in seconds to wait before considering an established client connection timed out. Typically shorter than the time to wait on an initial connection because this connection should already have been setup and any interruption should be trapped quicker.",
+            "env_variable": "CONNECT_TIMEOUT",
+            "default_value": "20",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|numeric|min:1"
+        },
+        {
+            "name": "[Advanced] Network Quality",
+            "description": "[0 = Low, 1 = Medium, 2 = High, 3 = Ultra] Sets the network configuration for the game server (shouldn't need to be changed). NOTE: This overrides any \"FG.NetworkQuality\" commands made to the console!",
+            "env_variable": "NETWORK_QUALITY",
+            "default_value": "3",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer|between:0,3"
+        },
+        {
+            "name": "[Advanced] Branch Name",
+            "description": "[Accepted Values: \"public\", \"experimental\", or leave empty to use the primary branch of the server] Used to download or switch to a non-primary branch of the game server. \"Automatic Updates\" and \"Validate Server Files\" must be set to \"1\" to switch branches if the server is already installed. NOTE: Any non-primary branches may not be fully compatible\/stable!",
+            "env_variable": "SRCDS_BETAID",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable|in:public,experimental"
+        },
+        {
+            "name": "[Advanced] Satisfactory Dedicated Server App ID",
+            "description": "Steam App ID used for installation and updates. Rarely needs to be changed.",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "1690800",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|integer|min:1"
+        }
+    ]
+}
diff --git a/game_eggs/steamcmd_servers/scpsl/README.md b/game_eggs/steamcmd_servers/scpsl/README.md
index 33b220b1..9c00ef3a 100644
--- a/game_eggs/steamcmd_servers/scpsl/README.md
+++ b/game_eggs/steamcmd_servers/scpsl/README.md
@@ -1,29 +1,38 @@
-## SCP: Secret Laboratory
+# SCP: Secret Laboratory
+
+## [dedicated](dedicated/)
 
-### [dedicated](dedicated/)
 SCP: Secret Laboratory Dedicated Linux Server AddID: [996560](https://steamdb.info/app/996560/)
 This Server is NOT compatible with ServerMod2 or MultiAdmin
 
-### [MultiAdmin](multiadmin)
+## [MultiAdmin](multiadmin)
+
 SCP: Secret Laboratory Pterodactyl egg. Works with MP2. Steam AppID: [996560](https://steamdb.info/app/996560/)
 This server is **NOT** compatible with SMod2 due to it not being updated for MP2.
 This server is **NOT** compatible with LocalAdmin due to server input causing it to crash. MultiAdmin with a config option is used instead.
 
-### Minimum RAM
+## [Exiled Plugin Framework](exiled)
+
+SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework <https://github.com/Exiled-Team/EXILED>
+
+## Minimum RAM
+
 Minimum memory required to run the server: 3096 MB
 
-### Server Port
+## Server Port
+
 Default port required to run the server.
 
 | Port    | Default |
 |---------|---------|
 | Game    | 7777    |
 
-### Verification
+## Verification
 
 The server must be verified with the SCP:SL developers in order for it to be visible in the server browser.
 
 Instructions are as follows:
+
 * Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf).
 * Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information:
   1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777`
diff --git a/game_eggs/steamcmd_servers/scpsl/dedicated/README.md b/game_eggs/steamcmd_servers/scpsl/dedicated/README.md
index 60411e1b..8441932a 100644
--- a/game_eggs/steamcmd_servers/scpsl/dedicated/README.md
+++ b/game_eggs/steamcmd_servers/scpsl/dedicated/README.md
@@ -1,31 +1,33 @@
 # SCP: Secret Laboratory
+
 SCP: Secret Laboratory Dedicated Linux Server AddID: [996560](https://steamdb.info/app/996560/)
 
 This Server is NOT compatible with ServerMod2 or MultiAdmin
 
+## Minimum RAM warning
 
-### Minimum RAM warning
 Minimum required memory to run the server: 3096 MB
 
+## Server Ports
 
-### Server Ports
 Ports required to run the server in a table format.
 
 | Port    | default |
 |---------|---------|
 | Game    | 7777   |
 
-### Verification
+### Mods/Plugins may require additional ports to be added to the server
+
+## Verification
 
 The server must be verified to be visible in the Server Browser.
 
 Before requesting verification make sure your server follows the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf).
 
-#### Requesting Verification
+### Requesting Verification
+
 Once ready send an email to server.verification@scpslgame.com with the following info:
 
 * The server's external IPv4 address
 * The port used by the server
 * If the server IP is static or dynamic
-
-#### Mods/Plugins may require ports to be added to the server.
diff --git a/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json b/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json
index 07e48723..d6f12f63 100644
--- a/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json
+++ b/game_eggs/steamcmd_servers/scpsl/dedicated/egg-scpsl.json
@@ -4,25 +4,28 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-01-08T14:18:35+01:00",
+    "exported_at": "2021-11-14T11:16:57+01:00",
     "name": "SCP:SL",
     "author": "info@goover.de",
     "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server",
-    "features": null,
-    "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete"
+    "features": [
+        "steam_disk_space"
     ],
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:mono_latest"
+    ],
+    "file_denylist": [],
     "startup": ".\/LocalAdmin {{SERVER_PORT}}",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"Waiting for players..\",\r\n    \"userInteraction\": []\r\n}",
         "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
+        "stop": "EXIT"
     },
     "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\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\r\n\r\nmkdir -p $HOME\/.config",
-            "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 'debian:buster-slim'\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 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\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\r\n\r\nmkdir -p $HOME\/.config",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -46,4 +49,4 @@
             "rules": "required|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/scpsl/exiled/README.md b/game_eggs/steamcmd_servers/scpsl/exiled/README.md
new file mode 100644
index 00000000..68a47db1
--- /dev/null
+++ b/game_eggs/steamcmd_servers/scpsl/exiled/README.md
@@ -0,0 +1,26 @@
+# SCP: Secret Laboratory Exiled
+
+SCP: Secret Laboratory Pterodactyl egg with Exiled Plugin Framework <https://github.com/Exiled-Team/EXILED>
+
+## Minimum RAM
+
+Minimum memory required to run the server: 4096 MB
+
+## Server Port
+
+Default port required to run the server.
+
+| Port    | Default |
+|---------|---------|
+| Game    | 7777    |
+
+## Verification
+
+The server must be verified with the SCP:SL developers in order for it to be visible in the server browser.
+
+Instructions are as follows:
+
+* Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf).
+* Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information:
+  1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777`
+  2. If the server's IP is static or dynamic.
diff --git a/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json b/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json
new file mode 100644
index 00000000..efe895ce
--- /dev/null
+++ b/game_eggs/steamcmd_servers/scpsl/exiled/egg-s-c-p--s-l--exiled.json
@@ -0,0 +1,79 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-11-14T10:56:47+01:00",
+    "name": "SCP:SL - Exiled",
+    "author": "info@goover.de",
+    "description": "Egg for SCP: Secret Laboratory Dedicated Linux Server with Exiled Plugin Framework",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:mono_latest"
+    ],
+    "file_denylist": [],
+    "startup": ".\/LocalAdmin {{SERVER_PORT}}",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Waiting for players..\"\r\n}",
+        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "stop": "EXIT"
+    },
+    "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 lib32gcc-s1 ca-certificates jq file unzip wget\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\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\nchmod -R +rw \/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\r\n\r\nmkdir -p $HOME\/.config\r\n\r\n# Install Exiled\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\nwget ${DOWNLOAD_LINK}\r\ntar xzvf Exiled.tar.gz\r\n\r\nmv -f Assembly-CSharp.dll \/mnt\/server\/SCPSL_Data\/Managed\r\nmv -f EXILED \/mnt\/server\/.config\/",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "SRCDS_APPID",
+            "description": "",
+            "env_variable": "SRCDS_APPID",
+            "default_value": "996560",
+            "user_viewable": true,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Dotnet Bundle",
+            "description": "Only used for EXILED Framework Updater.",
+            "env_variable": "DOTNET_BUNDLE_EXTRACT_BASE_DIR",
+            "default_value": ".\/dotnet-bundle",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string"
+        },
+        {
+            "name": "Github Package",
+            "description": "",
+            "env_variable": "GITHUB_PACKAGE",
+            "default_value": "Exiled-Team\/EXILED",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:50"
+        },
+        {
+            "name": "Version",
+            "description": "",
+            "env_variable": "VERSION",
+            "default_value": "latest",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        },
+        {
+            "name": "Match",
+            "description": "",
+            "env_variable": "MATCH",
+            "default_value": "Exiled.tar.gz",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
diff --git a/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md b/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md
index 52e05da4..1ecf654b 100644
--- a/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md
+++ b/game_eggs/steamcmd_servers/scpsl/multiadmin/README.md
@@ -1,28 +1,29 @@
 # SCP: Secret Laboratory
+
 SCP: Secret Laboratory Pterodactyl egg. Works with MP2. Steam AppID: [996560](https://steamdb.info/app/996560/)
 
 This server is **NOT** compatible with SMod2 due to it not being updated for MP2.
 
 This server is **NOT** compatible with LocalAdmin due to server input causing it to crash. MultiAdmin with a config option is used instead.
 
+## Minimum RAM
 
-### Minimum RAM
 Minimum memory required to run the server: 3096 MB
 
+## Server Port
 
-### Server Port
 Default port required to run the server.
 
 | Port    | Default |
 |---------|---------|
 | Game    | 7777    |
 
-
-### Verification
+## Verification
 
 The server must be verified with the SCP:SL developers in order for it to be visible in the server browser.
 
 Instructions are as follows:
+
 * Make sure your server complies with the [Verified Server Rules](https://scpslgame.com/Verified_server_rules.pdf).
 * Send an email to `server.verification@scpslgame.com` from your configured contact email with the following information:
   1. The **public** IPv4 address of your server, with port. e.g. `69.69.69.69:7777`
diff --git a/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json b/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json
index b4dc6046..e422fd4b 100644
--- a/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json
+++ b/game_eggs/steamcmd_servers/scpsl/multiadmin/egg-s-c-p--secret-laboratory--multi-admin.json
@@ -1,13 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-09-05T22:38:43+02:00",
+    "exported_at": "2021-11-14T11:18:28+01:00",
     "name": "SCP: Secret Laboratory - MultiAdmin",
     "author": "info@goover.de",
     "description": "The latest vanilla version of SCP:SL running through MultiAdmin for compatibility. LocalAdmin does not work. No SMod2.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_mono-5-complete",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:mono_latest"
+    ],
+    "file_denylist": [],
     "startup": "mono MultiAdmin.exe --port {{SERVER_PORT}}",
     "config": {
         "files": "{\r\n    \"scp_multiadmin.cfg\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"use_new_input_system\": \"false\",\r\n            \"max_players:\": \" {{server.build.env.MAX_PLAYERS}}\"\r\n        }\r\n    },\r\n    \".config\/SCP Secret Laboratory\/config\/{{SERVER_PORT}}\/config_gameplay.txt\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server_ip:\": \"0.0.0.0\",\r\n            \"forward_ports\": \" false\",\r\n            \"contact_email:\": \"{{server.build.env.CONTACT_EMAIL}}\",\r\n            \"max_players:\": \"{{server.build.env.MAX_PLAYERS}}\"\r\n        }\r\n    }\r\n}",
@@ -17,8 +24,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "# Downloads SteamCMD\r\napt update\r\napt -y --no-install-recommends install curl unzip lib32gcc1 ca-certificates wget jq\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\n# Extracts SteamCMD\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\n\r\n# Downloads the server\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 996560 +quit\r\n\r\n# Hoster policy\r\necho 'gamedir_for_configs: true' >> \/mnt\/server\/hoster_policy.txt\r\nchmod +x \/mnt\/server\/hoster_policy.txt\r\n\r\n# Downloads MultiAdmin\r\ncd $HOME\r\nwget -qN https:\/\/github.com\/ServerMod\/MultiAdmin\/releases\/latest\/download\/MultiAdmin.exe\r\nchmod +x \/mnt\/server\/MultiAdmin.exe\r\n\r\n# Compatibility fix for MultiAdmin\r\necho \"use_new_input_system: false\" >> \/mnt\/server\/scp_multiadmin.cfg\r\necho \"max_players: 20\" >> \/mnt\/server\/scp_multiadmin.cfg",
-            "container": "ubuntu:latest",
+            "script": "# Downloads SteamCMD\r\napt update\r\napt -y --no-install-recommends install curl unzip lib32gcc-s1 ca-certificates wget jq\r\ncd \/tmp\r\ncurl -sSL -o steamcmd.tar.gz http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\n# Extracts SteamCMD\r\nmkdir -p \/mnt\/server\/steam\r\ntar -xzvf steamcmd.tar.gz -C \/mnt\/server\/steam\r\ncd \/mnt\/server\/steam\r\nchown -R root:root \/mnt\r\n\r\n# Downloads the server\r\nexport HOME=\/mnt\/server\r\n.\/steamcmd.sh +login anonymous +force_install_dir \/mnt\/server +app_update 996560 +quit\r\n\r\n# Hoster policy\r\necho 'gamedir_for_configs: true' >> \/mnt\/server\/hoster_policy.txt\r\nchmod +x \/mnt\/server\/hoster_policy.txt\r\n\r\n# Downloads MultiAdmin\r\ncd $HOME\r\nwget -qN https:\/\/github.com\/ServerMod\/MultiAdmin\/releases\/latest\/download\/MultiAdmin.exe\r\nchmod +x \/mnt\/server\/MultiAdmin.exe\r\n\r\n# Compatibility fix for MultiAdmin\r\necho \"use_new_input_system: false\" >> \/mnt\/server\/scp_multiadmin.cfg\r\necho \"max_players: 20\" >> \/mnt\/server\/scp_multiadmin.cfg",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -42,4 +49,4 @@
             "rules": "required|integer"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/soldat/README.md b/game_eggs/steamcmd_servers/soldat/README.md
index d1fc670e..23f2e904 100644
--- a/game_eggs/steamcmd_servers/soldat/README.md
+++ b/game_eggs/steamcmd_servers/soldat/README.md
@@ -1,4 +1,5 @@
 # Soldat
+
 Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content.
 
 ## Server Ports
diff --git a/game_eggs/steamcmd_servers/soldat/egg-soldat.json b/game_eggs/steamcmd_servers/soldat/egg-soldat.json
index 2da42877..235aaa83 100644
--- a/game_eggs/steamcmd_servers/soldat/egg-soldat.json
+++ b/game_eggs/steamcmd_servers/soldat/egg-soldat.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-10-06T16:59:53+02:00",
+    "exported_at": "2022-01-20T12:58:19-05:00",
     "name": "Soldat",
     "author": "info@goover.de",
     "description": "Soldat is a unique 2D (side-view) multiplayer action game. It has been influenced by the best of games such as Liero, Worms, Quake, and Counter-Strike and provides a fast-paced gaming experience with tons of blood and flesh. Soldiers fight against each other in 2D battle arenas using a deadly arsenal of military weapons, across 7 default game modes. It features 18 different weapons and 60 maps to frag away on, with full support for user created content.\r\n\r\nSteam: https:\/\/store.steampowered.com\/app\/638490\/Soldat\/",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/soldatserver",
     "config": {
         "files": "{\r\n    \"soldat.ini\": {\r\n        \"parser\": \"ini\",\r\n        \"find\": {\r\n            \"NETWORK.Port\": \"{{server.build.default.port}}\",\r\n            \"NETWORK.Max_Players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"NETWORK.Game_Password\": \"{{server.build.env.SRV_PWD}}\",\r\n            \"NETWORK.Admin_Password\": \"{{server.build.env.ADMIN_PASSWD}}\",\r\n            \"NETWORK.Server_Name\": \"{{server.build.env.SRV_NAME}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Done\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Done\"\r\n}",
+        "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
@@ -69,4 +76,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/space_engineers/README.md b/game_eggs/steamcmd_servers/space_engineers/README.md
index 61ebb364..6994bec6 100644
--- a/game_eggs/steamcmd_servers/space_engineers/README.md
+++ b/game_eggs/steamcmd_servers/space_engineers/README.md
@@ -1,5 +1,6 @@
 # Space Engineers
-Space Engineers is a voxel-based sandbox game set in space and on planets. 
+
+Space Engineers is a voxel-based sandbox game set in space and on planets.
 
 Many parts of this egg are based on the work of [mmmaxwwwell](https://github.com/mmmaxwwwell/space-engineers-dedicated-docker-linux). A thank you therefore goes to him.
 
@@ -10,12 +11,15 @@ When installed, the Server loads a base World and config from this repo. New wor
 Everything which is not defined in a variable could be edited directy in the config file /config/SpaceEngineers-Dedicated.cfg.
 
 ## Minumum server settings
+
 ### RAM
+
 This server requires about 6GB.
 
 Based on the information provided by the developer: [See here](https://www.spaceengineersgame.com/dedicated-servers/)
 
 ### Disk
+
 This server uses about 7GB of diskspace.
 
 ## Server Ports
diff --git a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json
index 747f0b71..c0cac4fa 100644
--- a/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json
+++ b/game_eggs/steamcmd_servers/space_engineers/egg-space-engineers.json
@@ -4,16 +4,18 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T04:22:12+03:00",
+    "exported_at": "2021-09-15T18:24:11-04:00",
     "name": "Space Engineers",
     "author": "tueye@tuworld.de",
     "description": "Space Engineers is a voxel-based sandbox game set in space and on planets.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5"
     ],
     "file_denylist": [],
-    "startup": "cd \/home\/container\/spaceengineers\/DedicatedServer64\/; wine \/home\/container\/spaceengineers\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession",
+    "startup": "cd \/home\/container\/DedicatedServer64\/; wine \/home\/container\/DedicatedServer64\/SpaceEngineersDedicated.exe -path Z:\\\\home\\\\container\\\\config -noconsole -ignorelastsession",
     "config": {
         "files": "{\r\n    \"config\/SpaceEngineers-Dedicated.cfg\": {\r\n        \"parser\": \"xml\",\r\n        \"find\": {\r\n            \"MyConfigDedicated.SessionSettings.GameMode\": \"{{server.build.env.SERVER_MODE}}\",\r\n            \"MyConfigDedicated.SessionSettings.MaxPlayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"MyConfigDedicated.SessionSettings.AutoSaveInMinutes\": \"{{server.build.env.SAVE_INTERVAL}}\",\r\n            \"MyConfigDedicated.SessionSettings.EnableSaving\": \"{{server.build.env.SAVE_ENABLED}}\",\r\n            \"MyConfigDedicated.LoadWorld\": \"Z:\\\\home\\\\container\\\\config\\\\Saves\\\\{{server.build.env.WORLD_NAME}}\\\\Sandbox.sbc\",\r\n            \"MyConfigDedicated.ServerPort\": \"{{server.build.default.port}}\",\r\n            \"MyConfigDedicated.SteamPort\": \"{{server.build.env.STEAM_PORT}}\",\r\n            \"MyConfigDedicated.ServerName\": \"{{server.build.env.SERVER_NAME}}\",\r\n            \"MyConfigDedicated.WorldName\": \"{{server.build.env.WORLD_NAME}}\",\r\n            \"MyConfigDedicated.ServerDescription\": \"{{server.build.env.SERVER_DESC}}\",\r\n            \"MyConfigDedicated.RemoteApiEnabled\": \"{{server.build.env.REMOTEAPI_ENABLE}}\",\r\n            \"MyConfigDedicated.RemoteApiPort\": \"{{server.build.env.REMOTEAPI_PORT}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Game ready...\"\r\n}",
@@ -22,7 +24,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\nexport HOME=\/mnt\/server\r\n\r\n## Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386 cabextract\r\napt install -y --install-recommends wine wine64 xvfb\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\nchown -R root:root \/mnt\r\n\r\n## Install game using steamcmd\r\nmkdir $HOME\/spaceengineers\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir $HOME\/spaceengineers +app_update ${APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n    curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n    unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi\r\n\r\n## Install WineTricks\r\nexport DISPLAY=:0.0\r\nexport WINEPREFIX=$HOME\/.wine\r\nrm -r $HOME\/.wine\r\nrm -r $HOME\/.cache\r\nmkdir -p $HOME\/.wine\r\nmkdir \/tmp\/winetricks\r\ncurl https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks -o \/tmp\/winetricks\/winetricks\r\nchmod +x \/tmp\/winetricks\/winetricks\r\nXvfb :0 -screen 0 1024x768x16 &\r\nenv WINEDLLOVERRIDES=\"mscoree=d;mshtml=d\" wineboot --init --force \/nogui\r\nenv \/tmp\/winetricks\/winetricks -q vcrun2017  \r\nenv \/tmp\/winetricks\/winetricks -q vcrun2013 \r\nenv \/tmp\/winetricks\/winetricks -q sound=disabled  \r\nenv \/tmp\/winetricks\/winetricks -q corefonts\r\nenv \/tmp\/winetricks\/winetricks -q --force dotnet48",
+            "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n## Define variables\r\ndlurl=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/steamcmd_servers\/space_engineers\"\r\nexport HOME=\/mnt\/server\r\n\r\n## Install dependencies\r\ndpkg --add-architecture i386\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates libsdl2-2.0-0:i386 cabextract\r\napt install -y --install-recommends wine wine64 xvfb\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\nchown -R root:root \/mnt\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${SRCDS_APPID} ${EXTRA_FLAGS} validate +quit\r\n\r\n## set up 32 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk32\r\ncp -v linux32\/steamclient.so ..\/.steam\/sdk32\/steamclient.so\r\n\r\n## set up 64 bit libraries\r\nmkdir -p $HOME\/.steam\/sdk64\r\ncp -v linux64\/steamclient.so ..\/.steam\/sdk64\/steamclient.so\r\n\r\n## Create world and config\r\nmkdir -p $HOME\/config\/Saves\r\nif [ ! -d $HOME\/config\/Saves\/World ]\r\nthen\r\n    curl $dlurl\/World.zip -o \/tmp\/World.zip\r\n    unzip \/tmp\/World.zip -d $HOME\/config\/Saves\/\r\nfi\r\nif [ ! -f $HOME\/config\/SpaceEngineers-Dedicated.cfg ]; then curl $dlurl\/SpaceEngineers-Dedicated.cfg -o $HOME\/config\/SpaceEngineers-Dedicated.cfg; fi\r\n\r\n## Install WineTricks\r\nexport DISPLAY=:0.0\r\nexport WINEPREFIX=$HOME\/.wine\r\nrm -r $HOME\/.wine\r\nrm -r $HOME\/.cache\r\nmkdir -p $HOME\/.wine\r\nmkdir \/tmp\/winetricks\r\ncurl https:\/\/raw.githubusercontent.com\/Winetricks\/winetricks\/master\/src\/winetricks -o \/tmp\/winetricks\/winetricks\r\nchmod +x \/tmp\/winetricks\/winetricks\r\nXvfb :0 -screen 0 1024x768x16 &\r\nenv WINEDLLOVERRIDES=\"mscoree=d;mshtml=d\" wineboot --init --force \/nogui\r\nenv \/tmp\/winetricks\/winetricks -q vcrun2017  \r\nenv \/tmp\/winetricks\/winetricks -q vcrun2013 \r\nenv \/tmp\/winetricks\/winetricks -q sound=disabled  \r\nenv \/tmp\/winetricks\/winetricks -q corefonts\r\nenv \/tmp\/winetricks\/winetricks -q --force dotnet48",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -31,7 +33,7 @@
         {
             "name": "APP ID",
             "description": "The ID corresponding to the game to download.",
-            "env_variable": "APPID",
+            "env_variable": "SRCDS_APPID",
             "default_value": "298740",
             "user_viewable": false,
             "user_editable": false,
@@ -153,6 +155,15 @@
             "user_viewable": false,
             "user_editable": false,
             "rules": "nullable|string|max:20"
+        },
+        {
+            "name": "Windows Install",
+            "description": "Required for auto-update",
+            "env_variable": "WINDOWS_INSTALL",
+            "default_value": "1",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|in:1"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/squad/README.md b/game_eggs/steamcmd_servers/squad/README.md
index d4db334a..ad310143 100644
--- a/game_eggs/steamcmd_servers/squad/README.md
+++ b/game_eggs/steamcmd_servers/squad/README.md
@@ -2,7 +2,8 @@
 
 Squad is an online multiplayer first-person shooter that aims to capture combat realism through communication and teamplay.
 
-### Server Ports
+## Server Ports
+
 Squad requires 4 ports
 
 | Port     | default |
@@ -10,4 +11,4 @@ Squad requires 4 ports
 | Game     | 7787    |
 | game +1  | 7788    |
 | Query    | 27165   |
-| Query +1 | 27166   |
\ No newline at end of file
+| Query +1 | 27166   |
diff --git a/game_eggs/steamcmd_servers/squad/egg-squad.json b/game_eggs/steamcmd_servers/squad/egg-squad.json
index 51a36b6b..51264aac 100644
--- a/game_eggs/steamcmd_servers/squad/egg-squad.json
+++ b/game_eggs/steamcmd_servers/squad/egg-squad.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-10-08T08:47:08-04:00",
+    "exported_at": "2022-01-20T12:59:49-05:00",
     "name": "Squad",
     "author": "brycea@terrahost.cloud",
     "description": "Squad is a 50 vs 50 multiplayer first-person shooter that aims to capture combat realism through communication and teamplay. Major features include vehicle-based combined arms gameplay, large scale environments, base building, and integrated positional VoIP for proximity talking & radio.",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/pterodactyl\/core:source"
+    ],
+    "file_denylist": [],
     "startup": "\/home\/container\/SquadGame\/Binaries\/Linux\/SquadGameServer SquadGame Port={{SERVER_PORT}} QueryPort={{QUERY_PORT}}",
     "config": {
         "files": "{\r\n    \"SquadGame\/ServerConfig\/Server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"ServerName\": \"ServerName=\\\"{{server.build.env.servername}}\\\"\",\r\n            \"MaxPlayers\": \"MaxPlayers={{server.build.env.maxplayers}}\",\r\n            \"AllowTeamChanges\": \"AllowTeamChanges={{server.build.env.allowteamchange}}\",\r\n            \"ShouldAdvertise\": \"ShouldAdvertise={{server.build.env.advertise}}\",\r\n            \"NumReservedSlots\": \"NumReservedSlots={{server.build.env.reservedslots}}\",\r\n            \"PreventTeamChangeIfUnbalanced\": \"PreventTeamChangeIfUnbalanced={{server.build.env.ptciu}}\",\r\n            \"EnforceTeamBalance\": \"EnforceTeamBalance={{server.build.env.teambal}}\",\r\n            \"RecordDemos\": \"RecordDemos={{server.build.env.recorddemos}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Engine Initialization\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": false,\r\n    \"location\": \"latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Engine Initialization\"\r\n}",
+        "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
@@ -28,8 +35,8 @@
             "description": "Query port for your Squad server.",
             "env_variable": "QUERY_PORT",
             "default_value": "27165",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric"
         },
         {
@@ -37,8 +44,8 @@
             "description": "this is needed for some reason",
             "env_variable": "LD_LIBRARY_PATH",
             "default_value": "\/home\/container\/linux64\/",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string"
         },
         {
@@ -46,8 +53,8 @@
             "description": "The ID corresponding to the game to download and run using SRCDS.",
             "env_variable": "SRCDS_APPID",
             "default_value": "403240",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -55,8 +62,8 @@
             "description": "The name for the server in the server list",
             "env_variable": "servername",
             "default_value": "Squad Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:30"
         },
         {
@@ -64,8 +71,8 @@
             "description": "Sets the maximum number of players.",
             "env_variable": "maxplayers",
             "default_value": "80",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required"
         },
         {
@@ -73,8 +80,8 @@
             "description": "Allow players to change teams ( true \/ false )",
             "env_variable": "allowteamchange",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -82,8 +89,8 @@
             "description": "Have the server report to the public server list ( true \/ false )",
             "env_variable": "advertise",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -91,8 +98,8 @@
             "description": "The number of reserved slots for admins \/ mods",
             "env_variable": "reservedslots",
             "default_value": "0",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -100,8 +107,8 @@
             "description": "This will prevent players from changing teams if they're already unbalanced ( true \/ false )",
             "env_variable": "ptciu",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -109,8 +116,8 @@
             "description": "This will FORCE team balance if the teams are too uneven ( true \/ false )",
             "env_variable": "teambal",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -118,9 +125,9 @@
             "description": "This will record demos of the players ( true \/ false )",
             "env_variable": "recorddemos",
             "default_value": "true",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/starbound/README.md b/game_eggs/steamcmd_servers/starbound/README.md
index 4329884b..d47f5969 100644
--- a/game_eggs/steamcmd_servers/starbound/README.md
+++ b/game_eggs/steamcmd_servers/starbound/README.md
@@ -1,12 +1,12 @@
 # Starbound
-Their desctiption:  
+
+Their desctiption:
 In Starbound, you create your own story - there’s no wrong way to play! You may choose to save the universe from the forces that destroyed your home, uncovering greater galactic mysteries in the process, or you may wish to forego a heroic journey entirely in favor of colonizing uncharted planets.
 
-### Server Ports
-Starbound requires a single port to be oepened
+## Server Ports
 
-game ports (default 21025 )
+Starbound requires a single port to be oepened
 
 | Port    | default |
 |---------|---------|
-| Game    |  21025  |
\ No newline at end of file
+| Game    |  21025  |
diff --git a/game_eggs/steamcmd_servers/starbound/egg-starbound.json b/game_eggs/steamcmd_servers/starbound/egg-starbound.json
index 3375688e..6a890b4d 100644
--- a/game_eggs/steamcmd_servers/starbound/egg-starbound.json
+++ b/game_eggs/steamcmd_servers/starbound/egg-starbound.json
@@ -8,7 +8,9 @@
     "name": "Starbound",
     "author": "parker@parkervcp.com",
     "description": "Starbound takes place in a two-dimensional, procedurally generated universe which the player is able to explore in order to obtain new weapons, armor, and items, and to visit towns and villages inhabited by various intelligent lifeforms.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:ubuntu_source"
     ],
@@ -71,7 +73,7 @@
             "default_value": "1",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         },
         {
             "name": "Use Workshop content",
@@ -80,7 +82,7 @@
             "default_value": "0",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|bool"
+            "rules": "required|boolean"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/stationeers/README.md b/game_eggs/steamcmd_servers/stationeers/README.md
index 63aefa53..a0e9bc73 100644
--- a/game_eggs/steamcmd_servers/stationeers/README.md
+++ b/game_eggs/steamcmd_servers/stationeers/README.md
@@ -1,15 +1,13 @@
 # Stationeers
-Steam Description  
+
+Steam Description
 Construct and manage your own space station either by yourself in singleplayer or with friends online! Fully functioning atmospherics, science, power, engineering, medical, logic, and agricultural systems. Explore to find asteroids and construct elaborate factories to harvest your resources!
 
-### Server Ports
+## Server Ports
+
 Stationeers requires up to 2 ports
 
-game port (default 27500)
-Steam Query Ports (default 27015)
-
-
-| Port    | default       |
-|---------|---------------|
-| Game    |     27500      |
-| Query     |     27015     |
\ No newline at end of file
+| Port        | default |
+|-------------|---------|
+| Game        | 27500   |
+| Steam Query | 27015   |
diff --git a/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json b/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json
index 3d498438..321ca2a6 100644
--- a/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json
+++ b/game_eggs/steamcmd_servers/stationeers/egg-stationeers.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-08-04T20:01:04-07:00",
+    "exported_at": "2022-01-20T13:00:48-05:00",
     "name": "Stationeers",
     "author": "sysadmin@whiteshield.ch",
     "description": "Stationeers Server\r\n\r\ndefault.ini will be created once you start game. Command parameters override default.ini parameters\r\nDon't forget to change the RCON Password !!\r\n\r\nRemote Administrator:\r\nYou can send commands on web browser.\r\nLink : http:\/\/[dedicated server address]:[GamePort]\r\n\r\nDedicated Server Wiki ==> https:\/\/stationeers-wiki.com\/Dedicated_Server_Guide\r\n\r\nStopping the server don't save the game, for manual save use the Remote Administrator.",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/pterodactyl\/core:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/rocketstation_DedicatedServer.x86_64 -batchmode -nographics -autostart -autosaveinterval={{SAVE_INTERVAL}} -clearallinterval={{CLEAR_INTERVAL}} -worldtype={{SERVER_MAP}} -worldname={{SAVE_NAME}} -loadworld={{SAVE_NAME}} -basedirectory=\/home\/container -updateport={{UPDATE_PORT}} -gameport={{GAME_PORT}}",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"Dedicated Server Started\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Dedicated Server Started\"\r\n}",
+        "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
@@ -28,8 +35,8 @@
             "description": "Available Maps: Moon, Mars, Europa, Vulcan, Space, Mimas, Loulan",
             "env_variable": "SERVER_MAP",
             "default_value": "Moon",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -37,8 +44,8 @@
             "description": "Sets the server\u2019s auto-save interval in seconds.",
             "env_variable": "SAVE_INTERVAL",
             "default_value": "300",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -46,8 +53,8 @@
             "description": "Clear disconnected player interval in seconds",
             "env_variable": "CLEAR_INTERVAL",
             "default_value": "86400",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -55,8 +62,8 @@
             "description": "Name of the save of your world.\r\nAuto save & auto load worlds on server startup.",
             "env_variable": "SAVE_NAME",
             "default_value": "stationeers_1",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:20"
         },
         {
@@ -64,8 +71,8 @@
             "description": "UDP port for game. Avoid to set 27015-27020. It's steam's local server query ports.",
             "env_variable": "GAME_PORT",
             "default_value": "27500",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -73,8 +80,8 @@
             "description": "UDP port for steam query must be between 27015-27020.",
             "env_variable": "UPDATE_PORT",
             "default_value": "27015",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer"
         },
         {
@@ -82,9 +89,9 @@
             "description": "Required for automatic updates.",
             "env_variable": "SRCDS_APPID",
             "default_value": "600760",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/stormworks/README.md b/game_eggs/steamcmd_servers/stormworks/README.md
index 6a0d5354..08ce0833 100644
--- a/game_eggs/steamcmd_servers/stormworks/README.md
+++ b/game_eggs/steamcmd_servers/stormworks/README.md
@@ -1,19 +1,23 @@
-### Stormworks: Build and Rescue 
+# Stormworks: Build and Rescue
+
 Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.
 
-### Configuration warning
+## Configuration warning
+
 Due to the way the Stormworks configuration file is formatted and the way Pterodactyl handles config file replacement this egg cannot be configured by Pterodactyl.  A config file is created in the container home directory (`/home/container/server_config.xml`) and must be manually updated for any changes, **INCLUDING THE PORT NUMBER**.  This egg will not work after installation and you **MUST** edit the `server_config.xml` file manually to use anything other than the default settings.
 
 For more information about the configuration file issue see the [Github issue](https://github.com/parkervcp/eggs/issues/522#issuecomment-652514654).
 
-### Server Ports
+## Server Ports
+
 Stormworks requires 3 consecutive ports in order to run.  The default ports are shown below.  Using non-default ports is possible however they must remain consecutive.
 
-| Port    | default |
-|---------|---------|
-| Game | 25564 |
-| Game | 25565 |
-| Game | 25566 |
+| Port | default |
+|------|---------|
+| Game | 25564   |
+| Game | 25565   |
+| Game | 25566   |
+
+## Console output
 
-### Console output
 The Stormworks server will constantly output updates to the server console when run under Wine.  Natively this results in text that updates in place, however there is no way to disable or limit the frequency of this output.  A [feature request](http://mcro.org/issues/view_issue/21739) was filed with the developer in hopes of improving the Linux support however it was rejected without comment.  At this time there is no known solution.
diff --git a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json
index 8bba45e2..9cb54ceb 100644
--- a/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json
+++ b/game_eggs/steamcmd_servers/stormworks/egg-stormworks--build-and-rescue.json
@@ -1,13 +1,20 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-10-27T03:09:48+00:00",
+    "exported_at": "2022-01-20T13:01:27-05:00",
     "name": "Stormworks: Build and Rescue",
     "author": "iamkubi@gmail.com",
     "description": "Join a world where you design, create and pilot your own air sea rescue service. Release your inner hero as you battle fierce storms out at sea to rescue those in need.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5"
+    ],
+    "file_denylist": [],
     "startup": "xvfb-run wine server.exe +server_dir \/home\/container",
     "config": {
         "files": "{}",
@@ -33,4 +40,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md
index e780fdf0..83381f39 100644
--- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md
+++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/README.md
@@ -1,25 +1,25 @@
-## Subnautica: Nitrox Mod
+# Subnautica: Nitrox Mod
+
 Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment.
 In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.
 The multiplayer function is provided by the mod "Nitrox". This mod is still in alpha version and therefore not yet fully stable.
-  
 
+## NOTE
 
-**NOTE**
 To download the base game, you will need to authenticate against Steam.
 Because of the normally active Steamgaurd protection, it is important to enter the Steamgaurd code.
 Once the initial installation is complete, you will need to enter the Steamguard code that will be emailed to you and then reinstall the server.
 
 This will only work if you receive Steamguard codes via mail. The Authenticator app is not supported.
 
-**NOTE**
+## NOTE 2
+
 NitroxMod version >=1.5.0.0 is required for this egg
 
 ## Server Ports
+
 The nitrox server requires only the default Server port.
 
-
-|   Port  | default |
-|---------|---------|
-| Server  |  any |
-
+| Port   | default |
+|--------|---------|
+| Server |   any   |
diff --git a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json
index 77c00477..446b9485 100644
--- a/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json
+++ b/game_eggs/steamcmd_servers/subnautica_nitrox_mod/egg-subnautica.json
@@ -8,7 +8,9 @@
     "name": "Subnautica",
     "author": "tueye@tuworld.de",
     "description": "Subnautica is an open world survival action-adventure video game developed and published by Unknown Worlds Entertainment. In it, players are free to explore the ocean on an alien planet, known as planet 4546B, after their spaceship, the Aurora, crashes on the planet's surface.\r\n\r\nNote: NitroxMod version >=1.5.0.0 is required",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/pterodactyl\/core:mono"
     ],
@@ -146,4 +148,4 @@
             "rules": "required|string|in:PROTOBUF,JSON"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/svencoop/README.md b/game_eggs/steamcmd_servers/svencoop/README.md
index af43edf9..f76e91ea 100644
--- a/game_eggs/steamcmd_servers/svencoop/README.md
+++ b/game_eggs/steamcmd_servers/svencoop/README.md
@@ -1,7 +1,9 @@
 # Sven Co-op
+
 Sven Co-op is a co-operative game originally based around Valve Software's Half-Life. In this game players must work together against computer controlled enemies and solve puzzles as a team.
 
-### Server Ports
+## Server Ports
+
 Sven co-op requires a single port to be opened
 
 game ports (default 27015 )
diff --git a/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json b/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json
index c341b5a7..07374e03 100644
--- a/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json
+++ b/game_eggs/steamcmd_servers/svencoop/egg-sven-co-op.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-11-14T21:43:14+01:00",
+    "exported_at": "2022-01-20T13:02:23-05:00",
     "name": "Sven Co-op",
     "author": "pteroducktyl@yildri.nl",
     "description": "Sven Co-op is a co-operative game originally based around Valve Software's Half-Life. In this game players must work together against computer controlled enemies and solve puzzles as a team.",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/pterodactyl\/core:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/svends_run -console -port {{SERVER_PORT}} +maxplayers {{SC_PLAYERS}} +map {{SC_MAP}} +ip 0.0.0.0 -strictportbind -norestart",
     "config": {
         "files": "{\r\n    \"svencoop\/server.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"hostname\": \"hostname \\\"{{env.SC_NAME}}\\\"\",\r\n            \"sv_password\": \"sv_password \\\"{{env.SC_PASSWORD}}\\\"\",\r\n            \"\/\/sv_password\": \"sv_password \\\"{{env.SC_PASSWORD}}\\\"\",\r\n            \"sv_region\": \"sv_region {{env.SC_REGION}}\"\r\n        }\r\n    }\r\n}",
-        "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": {
@@ -28,8 +35,8 @@
             "description": "The default map for the server.",
             "env_variable": "SC_MAP",
             "default_value": "svencoop1",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string"
         },
         {
@@ -37,8 +44,8 @@
             "description": "The maximum amount of players that can play on the server at once.",
             "env_variable": "SC_PLAYERS",
             "default_value": "12",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric|between:2,32"
         },
         {
@@ -46,8 +53,8 @@
             "description": "The name your server will appear as on the in Sven Co-op in-game server list.",
             "env_variable": "SC_NAME",
             "default_value": "Sven Co-op server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:40"
         },
         {
@@ -55,8 +62,8 @@
             "description": "Password required to join the server. Leave blank to disable.",
             "env_variable": "SC_PASSWORD",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|string|max:20"
         },
         {
@@ -64,8 +71,8 @@
             "description": "The region your server is in. This is used in Steam's server browser, so players can look for servers near by. This does not restrict players from connecting to your server.\r\n\r\n-1: Do not list server in the server browser.\r\n0: USA east coast.\r\n1: USA west coast.\r\n2: South America (continent)\r\n3: Europe.\r\n4: Asia.\r\n5: Australia (continent, aka Oceania)\r\n6: Middle East.\r\n7: Africa.\r\n255: International.",
             "env_variable": "SC_REGION",
             "default_value": "255",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|numeric|between:-1,255"
         },
         {
@@ -73,9 +80,9 @@
             "description": "Required for game to update on server restart. Do not modify this.",
             "env_variable": "SRCDS_APPID",
             "default_value": "276060",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md b/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md
index 410bc742..43548100 100644
--- a/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md
+++ b/game_eggs/steamcmd_servers/team_fortress_2_classic/README.md
@@ -4,7 +4,8 @@
 
 Team Fortress 2 Classic is a re-imagining of the 2008-2009 era of the original Team Fortress 2, of which is what we consider the "Classic Era", featuring old features that were scrapped and worked upon, or new content such as new weapons and gamemodes.
 
-### Server Ports
+## Server Ports
+
 TF2C servers require 1 port to be open, the SourceTV port can also be opened for spectators.
 
 | Port      | default |
diff --git a/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json b/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json
index 3679525f..73df31e8 100644
--- a/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json
+++ b/game_eggs/steamcmd_servers/team_fortress_2_classic/egg-team-fortress-2-classic.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-10-13T15:32:28+01:00",
+    "exported_at": "2022-01-20T13:03:12-05:00",
     "name": "Team Fortress 2 Classic",
     "author": "eggs@scattergun.io",
     "description": "Team Fortress 2 Classic is a free mod of the 2007 game Team Fortress 2, developed by Eminoma and utilizing the Source engine.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_base",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_base"
+    ],
+    "file_denylist": [],
     "startup": ".\/srcds_run -game {{SRCDS_GAME}} -console -port {{SERVER_PORT}} +map {{SRCDS_MAP}} +ip {{SERVER_IP}} -strictportbind -norestart -debug +maxplayers {{MAXPLAYERS}}",
     "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": {
diff --git a/game_eggs/steamcmd_servers/the_forest/README.md b/game_eggs/steamcmd_servers/the_forest/README.md
index 5361f9a7..1e3b50d7 100644
--- a/game_eggs/steamcmd_servers/the_forest/README.md
+++ b/game_eggs/steamcmd_servers/the_forest/README.md
@@ -1,20 +1,19 @@
-## The Forest
-As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. 
+# The Forest
+
+As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants.
 Build, explore, survive in this terrifying first-person survival horror simulator.
-  
 
+## NOTE
 
-**NOTE**
 This server requires a Steam Token
-You can generate the token on steam at https://steamcommunity.com/dev/managegameservers
+You can generate the token on steam at <https://steamcommunity.com/dev/managegameservers>
 
 ## Server Ports
+
 The forest server requires three ports for access Server port (Default), Steam port (8766), Query Port (27016) but some plugins may require extra ports to enabled for the server.
 
-
-|   Port  | default |
-|---------|---------|
-| Server  |  any |
-| Steam   |  8766  |
-| Query   |  27016  |
-
+| Port   | default |
+|--------|---------|
+| Server | any     |
+| Steam  | 8766    |
+| Query  | 27016   |
diff --git a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json
index f23cea77..23b736c0 100644
--- a/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json
+++ b/game_eggs/steamcmd_servers/the_forest/egg-the-forest.json
@@ -4,25 +4,28 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-01-03T20:24:12+01:00",
+    "exported_at": "2021-11-25T23:18:02+00:00",
     "name": "The Forest",
     "author": "admin@softwarenoob.com",
     "description": "As the lone survivor of a passenger jet crash, you find yourself in a mysterious forest battling to stay alive against a society of cannibalistic mutants. Build, explore, survive in this terrifying first-person survival horror simulator.",
-    "features": null,
-    "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:ubuntu_wine-xvfb"
+    "features": [
+        "steam_disk_space"
     ],
-    "startup": ".\/start.sh",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:wine_latest"
+    ],
+    "file_denylist": [],
+    "startup": "xvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'",
     "config": {
-        "files": "{\r\n    \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"serverIP\": \"serverIP {{server.build.default.ip}}:{{server.build.default.port}}\",\r\n            \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n            \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n            \"serverQueryPort\": \"serverQueryPort {{server.build.env.QUERY_PORT}}\",\r\n            \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n            \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n            \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n            \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n            \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n            \"enableVAC\": \"enableVAC {{server.build.env.VAC}}\",\r\n            \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"serverIP\": \"serverIP 0.0.0.0\",\r\n            \"serverSteamPort\": \"serverSteamPort {{server.build.env.STEAM_PORT}}\",\r\n            \"serverGamePort\": \"serverGamePort {{server.build.default.port}}\",\r\n            \"serverQueryPort\": \"serverQueryPort {{server.build.env.QUERY_PORT}}\",\r\n            \"serverName\": \"serverName {{server.build.env.SERVER_NAME}}\",\r\n            \"serverPlayers\": \"serverPlayers {{server.build.env.MAX_PLAYERS}}\",\r\n            \"serverPassword\": \"serverPassword {{server.build.env.SERVER_PASS}}\",\r\n            \"serverPasswordAdmin\": \"serverPasswordAdmin {{server.build.env.ADMIN_PASS}}\",\r\n            \"serverSteamAccount\": \"serverSteamAccount {{server.build.env.STEAM_ACC}}\",\r\n            \"enableVAC\": \"enableVAC {{server.build.env.VAC}}\",\r\n            \"difficulty\": \"difficulty {{server.build.env.SERVER_DIFFICULTY}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Game autosave started\"\r\n}",
         "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt update\r\napt -y --no-install-recommends install curl unzip libstdc++6 lib32gcc1 ca-certificates\r\n\r\n\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +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\r\n\r\n## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\necho \"#!\/bin\/sh\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\nxvfb-run --auto-servernum --server-args='-screen 0 640x480x24:32' wine64 \/home\/container\/TheForestDedicatedServer.exe -batchmode -nographics -nosteamclient -savefolderpath \/home\/container\/TheForestDedicatedServer_Data -configfilepath \/home\/container\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg |grep -v 'RenderTexture.Create failed: format unsupported - 2.'\" > \/mnt\/server\/start.sh\r\nchmod +x \/mnt\/server\/start.sh\r\n\r\n## Create Config\r\n\r\nmkdir -p $HOME\/TheForestDedicatedServer_Data\/forest\/config\/\r\n#rm -fR $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\ncat <<EOT > $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\n\/\/ Dedicated Server Settings.\r\n\/\/ Server IP address - Note: If you have a router, this address is the internal address, and you need to configure ports forwarding, append the current game port here as well\r\nserverIP\r\n\/\/ Steam Communication Port - Note: If you have a router you will need to open this port.\r\nserverSteamPort\r\n\/\/ Game Communication Port - Note: If you have a router you will need to open this port.\r\nserverGamePort\r\n\/\/ Query Communication Port - Note: If you have a router you will need to open this port.\r\nserverQueryPort\r\n\/\/ Server display name\r\nserverName\r\n\/\/ Maximum number of players\r\nserverPlayers 5\r\n\/\/ Server password. blank means no password\r\nserverPassword\r\n\/\/ Server administration password. blank means no password\r\nserverPasswordAdmin\r\n\/\/ Your Steam account name. blank means anonymous (see Steam server account bellow)\r\nserverSteamAccount\r\n\/\/ Enable VAC (Valve Anti Cheat) on the server. off by default, uncomment to enable\r\nenableVAC on\r\n\/\/ Time between server auto saves in minutes\r\nserverAutoSaveInterval 15\r\n\/\/ Game difficulty mode. Must be set to \"Peaceful\" \"Normal\" or \"Hard\"\r\ndifficulty Normal\r\n\/\/ New or continue a game. Must be set to \"New\" or \"Continue\"\r\ninitType New\r\n\/\/ Slot to save the game. Must be set 1 2 3 4 or 5\r\nslot 1\r\n\/\/ Show event log. Must be set \"off\" or \"on\"\r\nshowLogs off\r\n\/\/ Contact email for server admin\r\nserverContact email@gmail.com\r\n\/\/ No enemies. Must be set to \"on\" or \"off\"\r\nveganMode off\r\n\/\/ No enemies during day time. Must be set to \"on\" or \"off\"\r\nvegetarianMode off\r\n\/\/ Reset all structure holes when loading a save. Must be set to \"on\" or \"off\"\r\nresetHolesMode off\r\n\/\/ Regrow 10% of cut down trees when sleeping. Must be set to \"on\" or \"off\"\r\ntreeRegrowMode off\r\n\/\/ Allow building destruction. Must be set to \"on\" or \"off\"\r\nallowBuildingDestruction on\r\n\/\/ Allow enemies in creative games. Must be set to \"on\" or \"off\"\r\nallowEnemiesCreativeMode off\r\n\/\/ Allow clients to use the built in development console. Must be set to \"on\" or \"off\"\r\nallowCheats off\r\n\/\/ Allows defining a custom folder for save slots, leave empty to use the default location\r\nsaveFolderPath\r\n\/\/ Target FPS when no client is connected\r\ntargetFpsIdle 5\r\n\/\/ Target FPS when there is at least one client connected\r\ntargetFpsActive 60\r\nEOT",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/bash\r\n# Installation Script\r\n#\r\n# Install dependencies\r\napt -y --no-install-recommends install libstdc++6 lib32gcc-s1 ca-certificates\r\n\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\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\nchown -R root:root \/mnt\r\nexport HOME=\/mnt\/server\r\n\r\n## Install game using steamcmd\r\n.\/steamcmd.sh +login anonymous +@sSteamCmdForcePlatformType windows +force_install_dir \/mnt\/server +app_update ${APPID} ${EXTRA_FLAGS} validate +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\r\n\r\n## Configure wine and server startup config\r\nmkdir -p \/home\/container\/.wine64\r\nexport WINEARCH=win64\r\nexport WINEPREFIX=\/home\/container\/.wine64\r\n\r\n## Create Config\r\n\r\nmkdir -p $HOME\/TheForestDedicatedServer_Data\/forest\/config\/\r\n#rm -fR $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\ncat <<EOT > $HOME\/TheForestDedicatedServer_Data\/forest\/config\/config.cfg\r\n\/\/ Dedicated Server Settings.\r\n\/\/ Server IP address - Note: If you have a router, this address is the internal address, and you need to configure ports forwarding, append the current game port here as well\r\nserverIP\r\n\/\/ Steam Communication Port - Note: If you have a router you will need to open this port.\r\nserverSteamPort\r\n\/\/ Game Communication Port - Note: If you have a router you will need to open this port.\r\nserverGamePort\r\n\/\/ Query Communication Port - Note: If you have a router you will need to open this port.\r\nserverQueryPort\r\n\/\/ Server display name\r\nserverName\r\n\/\/ Maximum number of players\r\nserverPlayers 5\r\n\/\/ Server password. blank means no password\r\nserverPassword\r\n\/\/ Server administration password. blank means no password\r\nserverPasswordAdmin\r\n\/\/ Your Steam account name. blank means anonymous (see Steam server account bellow)\r\nserverSteamAccount\r\n\/\/ Enable VAC (Valve Anti Cheat) on the server. off by default, uncomment to enable\r\nenableVAC on\r\n\/\/ Time between server auto saves in minutes\r\nserverAutoSaveInterval 15\r\n\/\/ Game difficulty mode. Must be set to \"Peaceful\" \"Normal\" or \"Hard\"\r\ndifficulty Normal\r\n\/\/ New or continue a game. Must be set to \"New\" or \"Continue\"\r\ninitType New\r\n\/\/ Slot to save the game. Must be set 1 2 3 4 or 5\r\nslot 1\r\n\/\/ Show event log. Must be set \"off\" or \"on\"\r\nshowLogs off\r\n\/\/ Contact email for server admin\r\nserverContact email@gmail.com\r\n\/\/ No enemies. Must be set to \"on\" or \"off\"\r\nveganMode off\r\n\/\/ No enemies during day time. Must be set to \"on\" or \"off\"\r\nvegetarianMode off\r\n\/\/ Reset all structure holes when loading a save. Must be set to \"on\" or \"off\"\r\nresetHolesMode off\r\n\/\/ Regrow 10% of cut down trees when sleeping. Must be set to \"on\" or \"off\"\r\ntreeRegrowMode off\r\n\/\/ Allow building destruction. Must be set to \"on\" or \"off\"\r\nallowBuildingDestruction on\r\n\/\/ Allow enemies in creative games. Must be set to \"on\" or \"off\"\r\nallowEnemiesCreativeMode off\r\n\/\/ Allow clients to use the built in development console. Must be set to \"on\" or \"off\"\r\nallowCheats off\r\n\/\/ Allows defining a custom folder for save slots, leave empty to use the default location\r\nsaveFolderPath\r\n\/\/ Target FPS when no client is connected\r\ntargetFpsIdle 5\r\n\/\/ Target FPS when there is at least one client connected\r\ntargetFpsActive 60\r\nEOT",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -30,7 +33,7 @@
         {
             "name": "APP ID",
             "description": "The ID corresponding to the game to download.",
-            "env_variable": "APPID",
+            "env_variable": "SRCDS_APPID",
             "default_value": "556450",
             "user_viewable": false,
             "user_editable": false,
@@ -55,7 +58,7 @@
             "rules": "required|string|max:20"
         },
         {
-            "name": "Query Port",
+            "name": "[Connection Port] Query Port",
             "description": "Query port, this port is also used for connecting to the server",
             "env_variable": "QUERY_PORT",
             "default_value": "27016",
@@ -116,6 +119,24 @@
             "user_viewable": true,
             "user_editable": true,
             "rules": "required|string|max:3"
+        },
+        {
+            "name": "Windows Install",
+            "description": "This is required to install the correct Forest version. Removing or touching this will overwrite the files with a non-existing Linux releases.",
+            "env_variable": "WINDOWS_INSTALL",
+            "default_value": "1",
+            "user_viewable": false,
+            "user_editable": false,
+            "rules": "required|string|in:1"
+        },
+        {
+            "name": "Auto-Update",
+            "description": "0 disables auto-update on each server startup, while 1 enables it.",
+            "env_variable": "AUTO_UPDATE",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|boolean"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/tower_unite/README.md b/game_eggs/steamcmd_servers/tower_unite/README.md
index f43f9408..06afcf0e 100644
--- a/game_eggs/steamcmd_servers/tower_unite/README.md
+++ b/game_eggs/steamcmd_servers/tower_unite/README.md
@@ -1,8 +1,10 @@
 # Tower Unite
+
 Their desctiption:
 Every aspect of Tower Unite allows for online multiplayer interaction. It is a living and evolving online game world, driven by the community. Play games online with your friends, or make new friends from across the globe.
 
-### Server Ports
+## Server Ports
+
 Tower Unite requires a single port to be opened
 
 | Port    | default |
diff --git a/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json b/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json
index 43f7687b..733cba6c 100644
--- a/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json
+++ b/game_eggs/steamcmd_servers/tower_unite/egg-tower-unite.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2019-02-08T01:46:57+01:00",
+    "exported_at": "2022-01-20T13:03:59-05:00",
     "name": "Tower Unite",
     "author": "teamwuffy@gmail.com",
     "description": "Tower Unite\r\n\r\nDefault Port: 7778\r\nDefault Query Port: 27016\r\n\r\nConfig Path: Tower\/Saved\/Config\/TowerServer.ini",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/pterodactyl\/core:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/Tower\/Binaries\/Linux\/TowerServer-Linux-Shipping -log -Port={{SERVER_PORT}} -MULTIHOME=0.0.0.0 -TowerServerINI=..\/..\/Saved\/Config\/TowerServer.ini",
     "config": {
         "files": "{\r\n    \"Tower\/Saved\/Config\/TowerServer.ini\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"MaxPlayers\": \"{{server.build.env.SERVER_MAX_PLAYER}}\",\r\n            \"ServerTitle\": \"{{server.build.env.SERVER_TITLE}}\",\r\n            \"SteamLoginToken\": \"{{server.build.env.STEAM_LOGIN_TOKEN}}\",\r\n            \"AdminSteamID\": \"{{server.build.env.STEAM_ADMIN_ID}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Match State Changed from EnteringMap to WaitingToStart\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Match State Changed from EnteringMap to WaitingToStart\"\r\n}",
+        "logs": "{}",
         "stop": "^C"
     },
     "scripts": {
@@ -28,8 +35,8 @@
             "description": "Login and generate a token for the app-id: 394690\r\nhttps:\/\/steamcommunity.com\/dev\/managegameservers",
             "env_variable": "STEAM_LOGIN_TOKEN",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:100"
         },
         {
@@ -37,8 +44,8 @@
             "description": "Note that your admin id is only a number!",
             "env_variable": "STEAM_ADMIN_ID",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|integer|max:76561202255233023"
         },
         {
@@ -46,8 +53,8 @@
             "description": "",
             "env_variable": "SERVER_TITLE",
             "default_value": "Tower Unite Server",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "required|string|max:512"
         },
         {
@@ -55,9 +62,9 @@
             "description": "",
             "env_variable": "SERVER_MAX_PLAYER",
             "default_value": "40",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|integer|max:512"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/unturned/README.md b/game_eggs/steamcmd_servers/unturned/README.md
index 32b69f98..3376abb0 100644
--- a/game_eggs/steamcmd_servers/unturned/README.md
+++ b/game_eggs/steamcmd_servers/unturned/README.md
@@ -1,13 +1,15 @@
 # Unturned
 
-Steam Description  
-You're one of the few not yet turned zombie. Keeping it that way will be a challenge.  
-- Go in guns blazing and attract the attention of everything, living and dead.  
-- Take a subtle approach sneaking around and making use of distractions.  
-- Confront and learn to counter special abilities ranging from invisibility to fire breathing to lightning attacks.  
+Steam Description
+You're one of the few not yet turned zombie. Keeping it that way will be a challenge.
 
-### Server Ports
-Rocketmod requires 3 ports to run properly.  
+- Go in guns blazing and attract the attention of everything, living and dead.
+- Take a subtle approach sneaking around and making use of distractions.
+- Confront and learn to counter special abilities ranging from invisibility to fire breathing to lightning attacks.
+
+## Server Ports
+
+Rocketmod requires 3 ports to run properly.
 
 | Port    | default |
 |---------|---------|
diff --git a/game_eggs/steamcmd_servers/unturned/egg-unturned.json b/game_eggs/steamcmd_servers/unturned/egg-unturned.json
index aa20570f..8f4ad1b2 100644
--- a/game_eggs/steamcmd_servers/unturned/egg-unturned.json
+++ b/game_eggs/steamcmd_servers/unturned/egg-unturned.json
@@ -1,18 +1,25 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-07-12T22:04:47-04:00",
+    "exported_at": "2022-01-20T13:04:52-05:00",
     "name": "Unturned",
     "author": "parker@parkervcp.com",
     "description": "Vanilla Unturned with the included RockerMod.",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_source",
+    "features": [
+        "steam_disk_space"
+    ],
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:debian_source"
+    ],
+    "file_denylist": [],
     "startup": ".\/Unturned_Headless.x86_64 -batchmode -nographics -bind 0.0.0.0 -port {{SERVER_PORT}}",
     "config": {
         "files": "{}",
-        "startup": "{\r\n    \"done\": \"Loading level: 100%\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"latest.log\"\r\n}",
+        "startup": "{\r\n    \"done\": \"Loading level: 100%\"\r\n}",
+        "logs": "{}",
         "stop": "shutdown"
     },
     "scripts": {
@@ -28,8 +35,8 @@
             "description": "Steam App ID require for install and startup update",
             "env_variable": "SRCDS_APPID",
             "default_value": "1110390",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string|max:20"
         },
         {
@@ -37,8 +44,8 @@
             "description": "This is needed to load specific libraries",
             "env_variable": "LD_LIBRARY_PATH",
             "default_value": ".\/Unturned_Headless_Data\/Plugins\/x86_64\/",
-            "user_viewable": 0,
-            "user_editable": 0,
+            "user_viewable": false,
+            "user_editable": false,
             "rules": "required|string"
         },
         {
@@ -46,8 +53,8 @@
             "description": "Should be left blank for anon user",
             "env_variable": "STEAM_USER",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|string"
         },
         {
@@ -55,8 +62,8 @@
             "description": "",
             "env_variable": "STEAM_PASS",
             "default_value": "",
-            "user_viewable": 1,
-            "user_editable": 1,
+            "user_viewable": true,
+            "user_editable": true,
             "rules": "nullable|string"
         }
     ]
diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md
index d6a9a2ef..feb0c1f7 100644
--- a/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md
+++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/README.md
@@ -1,22 +1,23 @@
 # Valheim Plus Mod
 
 ## Valheim
+
 A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture. Battle, build, and conquer your way to a saga worthy of Odin’s patronage!
 https://store.steampowered.com/app/892970/Valheim/
 
 ## Plus Mod
+
 A HarmonyX Mod aimed at improving the gameplay quality of Valheim. The mod includes several different main features including modifiers to ingame stats of players, buildings and entities and a sophisticated system to build and place objects with high precision and a system to modify already placed objects with high precision. The general goal is to provide V+ as a base modification for your gameplay to increase quality of life, change difficulty or have a better experience in general. The mod also comes with a version and configuration control system for servers and users, allowing servers to make sure that only people with the same configuration are able to join their servers.
 Support: https://github.com/valheimPlus/ValheimPlus
 Discord: https://discord.gg/AmH6Va97GT
 
 ***!!! ATTENTION !!!***
 
-***All (Server + Clients) need to have a installed Valheim Plus Mod !!!!*** 
-
+***All (Server + Clients) need to have a installed Valheim Plus Mod !!!!***
 
 ## Server Ports
 
 | Port  | default |
 |-------|---------|
-| Game  | 2456   |
-| Query | 2457   |
\ No newline at end of file
+| Game  | 2456    |
+| Query | 2457    |
diff --git a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json
index dd2290b5..cd0f888e 100644
--- a/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json
+++ b/game_eggs/steamcmd_servers/valheim/valheim_plus/egg-valheim-plus-mod.json
@@ -8,7 +8,9 @@
     "name": "Valheim Plus Mod",
     "author": "info@goover.de",
     "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.",
-    "features": null,
+    "features": [
+        "steam_disk_space"
+    ],
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:debian_source"
     ],
@@ -137,4 +139,4 @@
             "rules": "required|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md
index ef747e15..18839d85 100644
--- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md
+++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/README.md
@@ -1,11 +1,12 @@
 # Valheim
+
 A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture. Battle, build, and conquer your way to a saga worthy of Odin’s patronage!
 
-https://store.steampowered.com/app/892970/Valheim/
+<https://store.steampowered.com/app/892970/Valheim/>
 
 ## Server Ports
 
 | Port  | default |
 |-------|---------|
-| Game  | 2456   |
-| Query | 2457   |
\ No newline at end of file
+| Game  | 2456    |
+| Query | 2457    |
diff --git a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json
index d6162120..32bbf258 100644
--- a/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json
+++ b/game_eggs/steamcmd_servers/valheim/valheim_vanilla/egg-valheim.json
@@ -4,14 +4,17 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-02-17T16:43:58+01:00",
+    "exported_at": "2022-02-18T11:17:53+01:00",
     "name": "Valheim",
     "author": "magi1053@outlook.com",
     "description": "A brutal exploration and survival game for 1-10 players, set in a procedurally-generated purgatory inspired by viking culture.",
-    "features": null,
-    "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_source"
+    "features": [
+        "steam_disk_space"
     ],
+    "images": [
+        "ghcr.io\/parkervcp\/games:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/valheim_server.x86_64 -nographics -batchmode -name \"{{SERVER_NAME}}\" -port {{SERVER_PORT}} -world \"{{WORLD}}\" -password \"{{PASSWORD}}\" > >(sed -uE \"{{FILTER}}\") & trap \"{{STOP}}\" 15; wait $!",
     "config": {
         "files": "{}",
@@ -21,8 +24,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Valheim 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 --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    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\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\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# Image to install with is 'ghcr.io\/parkervcp\/installers:debian'\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 found here - https:\/\/developer.valvesoftware.com\/wiki\/Dedicated_Servers_List\r\n# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch\r\n# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.\r\n# INSTALL_FLAGS - Any additional SteamCMD  flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.\r\n# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.\r\n#\r\n ##\r\n\r\n# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.\r\napt -y update\r\napt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates\r\n\r\n## just in case someone removed the defaults.\r\nif [[ \"${STEAM_USER}\" == \"\" ]] || [[ \"${STEAM_PASS}\" == \"\" ]]; 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} $( [[ -z ${SRCDS_BETAID} ]] || printf %s \"-beta ${SRCDS_BETAID}\" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s \"-betapassword ${SRCDS_BETAPASS}\" ) ${INSTALL_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\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -97,7 +100,25 @@
             "default_value": "1",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:20"
+            "rules": "boolean"
+        },
+        {
+            "name": "Beta Branch",
+            "description": "",
+            "env_variable": "SRCDS_BETAID",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "max:30"
+        },
+        {
+            "name": "Betapassword",
+            "description": "",
+            "env_variable": "SRCDS_BETAPASS",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "max:30"
         }
     ]
 }
\ No newline at end of file
diff --git a/game_eggs/teeworlds/README.md b/game_eggs/teeworlds/README.md
index 3a18c931..6b416887 100644
--- a/game_eggs/teeworlds/README.md
+++ b/game_eggs/teeworlds/README.md
@@ -1,8 +1,11 @@
 # Teeworlds
-### From their [Site](https://www.teeworlds.com/)
+
+## From their [Site](https://www.teeworlds.com/)
+
 Teeworlds is a free online multiplayer game, available for all major operating systems. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
diff --git a/game_eggs/teeworlds/egg-teeworlds.json b/game_eggs/teeworlds/egg-teeworlds.json
index d90bfae1..e7239504 100644
--- a/game_eggs/teeworlds/egg-teeworlds.json
+++ b/game_eggs/teeworlds/egg-teeworlds.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-02T03:45:27+03:00",
+    "exported_at": "2022-01-22T05:44:04-05:00",
     "name": "Teeworlds",
     "author": "parker@parkervcp.com",
     "description": "Teeworlds is a free online multiplayer game, available for all major operating systems. Battle with up to 16 players in a variety of game modes, including Team Deathmatch and Capture The Flag. You can even design your own maps!",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/teeworlds_srv",
@@ -47,4 +47,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/terraria/README.md b/game_eggs/terraria/README.md
index 1a8469da..e421959f 100644
--- a/game_eggs/terraria/README.md
+++ b/game_eggs/terraria/README.md
@@ -1,13 +1,15 @@
 # Terraria
 
 ## Minimum RAM warning
+
 You may want to assign a minimum of 768 mb of RAM to a server as it will use around 650 mb to generate the world on the first start.
 
 ## Required Server Ports
+
 tModloader, like Terraria, only requires a single port to run. The default is 7777
 
 | Port    | default |
 |---------|---------|
 | Game    | 7777    |
 
-#### Plugins may require ports to be added to the server.
+### Plugins may require ports to be added to the server
diff --git a/game_eggs/terraria/tmodloader/README.md b/game_eggs/terraria/tmodloader/README.md
index 4fa490da..fd75ba46 100644
--- a/game_eggs/terraria/tmodloader/README.md
+++ b/game_eggs/terraria/tmodloader/README.md
@@ -1,29 +1,33 @@
 # tModLoader
-### From their [GitHub](https://github.com/tModLoader/tModLoader)
+
+## From their [GitHub](https://github.com/tModLoader/tModLoader)
+
 tModLoader is essentially a mod that provides a way to load your own mods without having to work directly with Terraria's source code itself. This means you can easily make mods that are compatible with other people's mods, save yourself the trouble of having to decompile and recompile Terraria.exe, and escape from having to understand all of the obscure "intricacies" of Terraria's source code. It is made to work for Terraria 1.3+.
 
-### Install notes
+## Install notes
+
 Due to rate limiting the console on the panel cannot keep up with the game console and the build will complete before the panel console may show it. Reloading the console will load it to the latest part of the log.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 You may want to assign a minimum of 768 mb of RAM to a server as it will use around 650 mb to generate the world on the first start.
 
+## Server Ports
 
-### Server Ports
 tModloader, like Terraria, only requires a single port to run. The default is 7777
 
 | Port    | default |
 |---------|---------|
 | Game    | 7777    |
 
-#### Plugins may require ports to be added to the server.
+### Plugins may require ports to be added to the server.
 
-### Extra Information
+## Extra Information
 
 If you want to download mods in the console, the startup command has to be changed.
 
-New startup:  
+New startup:
 `./tModLoaderServer -ip 0.0.0.0 -port ${SERVER_PORT} -maxplayers ${MAX_PLAYERS} -savedirectory ~/ -tmlsavedirectory ~/saves -modpath ~/mods`
 
-This will remove the autocreate function, and will thus allow you to download mods and generate world.  
+This will remove the autocreate function, and will thus allow you to download mods and generate world.
 Afterwards, you can change it back with the correct world name to start automatic. Word name is set in the configuration panel.
\ No newline at end of file
diff --git a/game_eggs/terraria/tshock/README.md b/game_eggs/terraria/tshock/README.md
index fec56632..16a21fc5 100644
--- a/game_eggs/terraria/tshock/README.md
+++ b/game_eggs/terraria/tshock/README.md
@@ -1,24 +1,27 @@
 # TShock
 
-TShock provides Terraria servers with server-side characters, anti-cheat, and community management tools. https://tshock.co/
+TShock provides Terraria servers with server-side characters, anti-cheat, and community management tools. <https://tshock.co/>
+
+## From their GitHub
 
-### From their GitHub
 TShock is a toolbox for Terraria servers and communities. That toolbox is jam packed with anti-cheat tools, server-side characters, groups, permissions, item bans, tons of commands, and limitless potential. It's one of a kind.
 
-### Server Ports
+## Server Ports
+
 TShock, like Terraria, only requires a single port to run. The default is 7777
 
 | Port    | default |
 |---------|---------|
 | Game    | 7777    |
 
-#### Plugins may require ports to be added to the server.
+### Plugins may require ports to be added to the server.
+
+## Extra Information
 
-### Extra Information
 If you want to download mods in the console, the startup command has to be changed.
 
-New startup:  
+New startup:
 `mono TerrariaServer.exe -ip 0.0.0.0 -port {{SERVER_PORT}} -maxplayers {{MAX_PLAYERS}}`
 
-This will remove the autocreate function, and will thus allow you to download mods and generate world.  
-Afterwards, you can change it back with the correct world name to start automatic. Word name is set in the configuration panel.
\ No newline at end of file
+This will remove the autocreate function, and will thus allow you to download mods and generate world.
+Afterwards, you can change it back with the correct world name to start automatic. Word name is set in the configuration panel.
diff --git a/game_eggs/terraria/tshock/egg-tshock.json b/game_eggs/terraria/tshock/egg-tshock.json
index 7cf576d7..0fed9f67 100644
--- a/game_eggs/terraria/tshock/egg-tshock.json
+++ b/game_eggs/terraria/tshock/egg-tshock.json
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n# Vanilla tModloader Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n## install packages to get version and download links\r\napt update\r\napt install -y curl wget jq file unzip\r\n\r\nGITHUB_PACKAGE=Pryaxis\/TShock\r\n\r\nif [ -z \"$GITHUB_USER\" ] && [ -z \"$GITHUB_OAUTH_TOKEN\" ] ; then\r\n    echo -e \"using anon api call\"\r\nelse\r\n    echo -e \"user and oauth token set\"\r\n    alias curl='curl -u $GITHUB_USER:$GITHUB_OAUTH_TOKEN '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\")\r\n\r\nif [ -z \"$TSHOCK_VERSION\" ] || [ \"$TSHOCK_VERSION\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url)\r\nelse\r\n    VERSION_CHECK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"$TSHOCK_VERSION\" == \"$VERSION_CHECK\" ]; then\r\n        DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url')\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: wget $DOWNLOAD_LINK\"\r\nwget $DOWNLOAD_LINK\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n    tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n    unzip ${DOWNLOAD_LINK##*\/}\r\nelse\r\n    echo -e \"unknown filetype. Exeting\"\r\n    exit 2 \r\nfi\r\n\r\necho -e \"install complete\"",
+            "script": "#!\/bin\/bash\r\n# Vanilla tModloader Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n## install packages to get version and download links\r\napt update\r\napt install -y curl wget jq file unzip\r\n\r\nGITHUB_PACKAGE=Pryaxis\/TShock\r\n\r\nif [ -z \"$GITHUB_USER\" ] && [ -z \"$GITHUB_OAUTH_TOKEN\" ] ; then\r\n    echo -e \"using anon api call\"\r\nelse\r\n    echo -e \"user and oauth token set\"\r\n    alias curl='curl -u $GITHUB_USER:$GITHUB_OAUTH_TOKEN '\r\nfi\r\n\r\n## get release info and download links\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/$GITHUB_PACKAGE\/releases\")\r\n\r\nif [ -z \"$TSHOCK_VERSION\" ] || [ \"$TSHOCK_VERSION\" == \"latest\" ]; then\r\n    DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url)\r\nelse\r\n    VERSION_CHECK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"$TSHOCK_VERSION\" == \"$VERSION_CHECK\" ]; then\r\n        DOWNLOAD_LINK=$(echo $RELEASES | jq -r --arg VERSION \"$TSHOCK_VERSION\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url')\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_LINK=$(echo $LATEST_JSON | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n## mkdir and cd to \/mnt\/server\/\r\nmkdir -p \/mnt\/server\r\n\r\ncd \/mnt\/server\r\n\r\n## download release\r\necho -e \"running: wget $DOWNLOAD_LINK\"\r\nwget $DOWNLOAD_LINK\r\n\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n    tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n    unzip -o ${DOWNLOAD_LINK##*\/}\r\nelse\r\n    echo -e \"unknown filetype. Exeting\"\r\n    exit 2 \r\nfi\r\n\r\necho -e \"install complete\"",
             "container": "debian:buster-slim",
             "entrypoint": "\/bin\/bash"
         }
@@ -60,4 +60,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/terraria/vanilla/README.md b/game_eggs/terraria/vanilla/README.md
index da96e637..a1758dd1 100644
--- a/game_eggs/terraria/vanilla/README.md
+++ b/game_eggs/terraria/vanilla/README.md
@@ -3,13 +3,15 @@
 Vanilla Terraria egg with support for Journey's End.  Currently up to 1.4.0.2 is supported, however future patches will require updates to the install script.
 
 ## Minimum RAM warning
+
 You may want to assign a minimum of 768 mb of RAM to a server as it will use around 650 mb to generate the world on the first start.
 
 ## Required Server Ports
+
 Terraria only requires a single port to run. The default is 7777
 
 | Port    | default |
 |---------|---------|
 | Game    | 7777    |
 
-#### Plugins may require ports to be added to the server.
+### Plugins may require ports to be added to the server
diff --git a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json
index 221f5218..fd32d73a 100644
--- a/game_eggs/terraria/vanilla/egg-terraria-vanilla.json
+++ b/game_eggs/terraria/vanilla/egg-terraria-vanilla.json
@@ -1,18 +1,22 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-06T02:18:03-08:00",
+    "exported_at": "2022-01-22T05:44:42-05:00",
     "name": "Terraria Vanilla",
     "author": "iamkubi@gmail.com",
     "description": "Dig, fight, explore, build! Nothing is impossible in this action-packed adventure game.",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/TerrariaServer.bin.x86_64 -config serverconfig.txt",
     "config": {
         "files": "{\r\n    \"serverconfig.txt\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"worldpath\": \"\/home\/container\/saves\/Worlds\",\r\n            \"worldname\": \"{{server.build.env.WORLD_NAME}}\",\r\n            \"world\": \"\/home\/container\/saves\/Worlds\/{{server.build.env.WORLD_NAME}}.wld\",\r\n            \"difficulty\": \"{{server.build.env.WORLD_DIFFICULTY}}\",\r\n            \"autocreate\": \"{{server.build.env.WORLD_SIZE}}\",\r\n            \"port\": \"{{server.build.default.port}}\",\r\n            \"maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"motd\": \"{{server.build.env.SERVER_MOTD}}\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Type 'help' for a list of commands\",\r\n    \"userInteraction\": []\r\n}",
+        "startup": "{\r\n    \"done\": \"Type 'help' for a list of commands\"\r\n}",
         "logs": "{}",
         "stop": "exit"
     },
@@ -48,8 +52,8 @@
             "env_variable": "MAX_PLAYERS",
             "default_value": "8",
             "user_viewable": true,
-            "user_editable": false,
-            "rules": "required|numeric|digits_between:1,3"
+            "user_editable": true,
+            "rules": "required|numeric|max:255"
         },
         {
             "name": "World Size",
@@ -58,7 +62,7 @@
             "default_value": "1",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|numeric|digits_between:1,3"
+            "rules": "required|numeric|in:1,2,3"
         },
         {
             "name": "Difficulty",
@@ -67,7 +71,7 @@
             "default_value": "3",
             "user_viewable": true,
             "user_editable": true,
-            "rules": "required|string|max:20"
+            "rules": "required|numeric|in:0,1,2,3"
         },
         {
             "name": "MOTD",
@@ -79,4 +83,4 @@
             "rules": "required|string|max:128"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/tycoon_games/README.md b/game_eggs/tycoon_games/README.md
new file mode 100644
index 00000000..cee33a2c
--- /dev/null
+++ b/game_eggs/tycoon_games/README.md
@@ -0,0 +1,9 @@
+# Tycoon Game Servers
+
+This is a collection of Tycoon game servers, that are typically open-source re-implementations of classic Tycoon titles.
+
+## Roller Coaster Tycoon 2
+[OpenRCT2](openrct2)
+
+## Transport Tycoon Deluxe
+[OpenTTD](openttd)
diff --git a/game_eggs/tycoon_games/openrct2/README.md b/game_eggs/tycoon_games/openrct2/README.md
new file mode 100644
index 00000000..b0dbaf98
--- /dev/null
+++ b/game_eggs/tycoon_games/openrct2/README.md
@@ -0,0 +1,88 @@
+# OpenRCT2
+***Note:** OpenRCT2 only recently (Jan. 2022) updated to support non-interactive Docker environments, and development is ongoing to improve it. Please understand future updates may be unstable, or this Egg may update in the future to accommodate changes.*
+___
+### Authors / Contributors
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+    <tr>
+        <td align="center">
+            <a href="https://github.com/lilkingjr1">
+                <img src="https://avatars.githubusercontent.com/u/4533989" width="50px;" alt=""/><br /><sub><b>Red-Thirten</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=lilkingjr1" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=lilkingjr1" title="Maintains">🔨</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/parkervcp">
+                <img src="https://avatars.githubusercontent.com/u/1207679" width="50px;" alt=""/><br /><sub><b>parkervcp</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/parkervcp/eggs/commits?author=parkervcp" title="Codes">💻</a>
+            <a href="https://github.com/parkervcp/eggs/commits?author=parkervcp" title="Contributor">💡</a>
+        </td>
+        <td align="center">
+            <a href="https://github.com/janisozaur">
+                <img src="https://avatars.githubusercontent.com/u/550290" width="50px;" alt=""/><br /><sub><b>janisozaur</b></sub>
+            </a>
+            <br />
+            <a href="https://github.com/OpenRCT2/OpenRCT2/commits?author=janisozaur" title="Codes">💻</a>
+            <a href="https://github.com/OpenRCT2/OpenRCT2/commits?author=janisozaur" title="Contributor">💡</a>
+        </td>
+    </tr>
+</table>
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+
+___
+### Game Description
+From OpenRCT2's [Website](https://openrct2.io/):
+> OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits. The gameplay revolves around building and maintaining an amusement park containing attractions, shops and facilities. The player must try to make a profit and maintain a good park reputation whilst keeping the guests happy. OpenRCT2 allows for both scenario and sandbox play. Scenarios require the player to complete a certain objective in a set time limit whilst sandbox allows the player to build a more flexible park with optionally no restrictions or finance.
+___
+### Server Ports
+| Port | Default (TCP) |
+|---------|---------|
+| Game | 11753 |
+
+___
+### Installation/System Requirements
+
+|  | Minimum |
+|---------|---------|
+| Processor | Multiarch is supported for most modern processors  |
+| RAM | 256-512 MiB (depends on # of clients & park size) |
+| Storage | 80 MB (*may require more if building from source*) |
+| RCT2 Files | **Not required** |
+
+___
+### Save Files
+Save files and autosaves are located in this directory:
+```
+/home/container/ServerData/save/
+```
+If the "Load Latest Autosave" startup variable is enabled, and the `autosave/` directory exists, the server will load the latest autosave instead of the specified Save File.
+___
+### Console Commands
+Until support for console commands to interactive programs gets added to Pterodactyl, entering commands via the panel's console do nothing (reference issue [pterodactyl/panel#3712](https://github.com/pterodactyl/panel/issues/3712)).
+___
+### Becoming an Admin on the Server
+Unfortunately, because console commands currently do not register, becoming the first admin on the server takes some steps, listed below:
+1. Ensure the "Log Server Actions" startup variable is set to "true".
+2. Start the server and join it with the client you want to make an admin.
+3. Open `ServerData/serverlogs/<Server Name>/<Latest Date>.txt` and copy the SHA1 hash next to your client's username (note the username as well).
+4. Then, open `ServerData/users.json`. Paste the hash into the "hash" value, and change the "name" value to your client's username.
+5. Reboot the server, re-join it, and you should be an admin!
+
+After becoming an admin, you can use the in-game users management window to add additional admins (or groups) more easily if you wish.
+___
+### Known Issues
+The following are known issues that are unique to running OpenRCT2 on Pterodactyl, but likely can only be fixed by further development/updates from OpenRCT2.
+- Only building from source from the `develop` branch currently yields a package that is bootable. This will no longer be true for any OpenRCT2 releases after v.0.3.5.1.
+    - This also means that clients joining the server must be on the latest `develop` branch as well.
+- Configuring a password on the server disallows non-admin clients from entering in a password in their client to connect; it just disconnects them. Admin clients can still join normally. (reference issue [OpenRCT2/OpenRCT2#16396](https://github.com/OpenRCT2/OpenRCT2/issues/16396))
+- You may rarely run into the server crashing on start due to a "Floating point exception(core dumped)" error. If this occurs to you, please help with OpenRCT2 development by doing the following:
+	1. Add the following to the beginning of your server's startup command: `SEGFAULT_SIGNALS=fpe LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so `
+	2. Start the server. If it boots normally, nothing extra will print. If it crashes, it will print a stack trace to the console.
+	3. If a crash occurs, copy the entire stack trace, and save it to a log sharing website (like [Hastebin](https://www.hastebin.com)).
+	4. [Open a new Bug Report Issue with OpenRCT2](https://github.com/OpenRCT2/OpenRCT2/issues/new?assignees=&labels=bug&template=bug_report.yaml) and share your logs with them.
diff --git a/game_eggs/tycoon_games/openrct2/egg-openrct2.json b/game_eggs/tycoon_games/openrct2/egg-openrct2.json
new file mode 100644
index 00000000..ed070f1a
--- /dev/null
+++ b/game_eggs/tycoon_games/openrct2/egg-openrct2.json
@@ -0,0 +1,193 @@
+{
+    "_comment": "Pterodactyl OpenRCT2 Egg ~ Red-Thirten and parkervcp ~ 2022-01-12",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "name": "OpenRCT2",
+    "author": "rehlmgaming@gmail.com",
+    "description": "OpenRCT2 is an open-source re-implementation of RollerCoaster Tycoon 2 (RCT2), expanding the game with new features, fixing bugs and raising game limits.",
+    "features": null,
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
+    "startup": ".\/OpenRCT2\/openrct2-cli --version && .\/OpenRCT2\/openrct2-cli host $(if {{LOAD_AUTOSAVE}} && [ -d ServerData\/save\/autosave\/ ]; then find ServerData\/save\/autosave\/ | sort -r | head -1; else echo \"{{SAVE_URI}}\"; fi) --port {{SERVER_PORT}} --user-data-path \/home\/container\/ServerData\/",
+    "config": {
+        "files": "{\r\n    \"ServerData\/config.ini\": {\r\n        \"parser\": \"ini\",\r\n        \"find\": {\r\n            \"general.autosave\": \"{{server.build.env.AUTOSAVE_INTERVAL}}\",\r\n            \"general.autosave_amount\": \"{{server.build.env.AUTOSAVE_AMOUNT}}\",\r\n            \"network.player_name\": \"\\\"{{server.build.env.SERVER_PLAYER_NAME}}\\\"\",\r\n            \"network.default_port\": \"{{server.build.default.port}}\",\r\n            \"network.default_password\": \"\\\"{{server.build.env.SERVER_PASSWORD}}\\\"\",\r\n            \"network.advertise\": \"{{server.build.env.SERVER_ADVERTISE}}\",\r\n            \"network.maxplayers\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"network.server_name\": \"\\\"{{server.build.env.SERVER_NAME}}\\\"\",\r\n            \"network.server_description\": \"\\\"{{server.build.env.SERVER_DESCRIPTION}}\\\"\",\r\n            \"network.server_greeting\": \"\\\"{{server.build.env.SERVER_GREETING}}\\\"\",\r\n            \"network.provider_name\": \"\\\"{{server.build.env.PROVIDER_NAME}}\\\"\",\r\n            \"network.provider_email\": \"\\\"{{server.build.env.PROVIDER_EMAIL}}\\\"\",\r\n            \"network.provider_website\": \"\\\"{{server.build.env.PROVIDER_WEBSITE}}\\\"\",\r\n            \"network.log_chat\": \"{{server.build.env.LOG_CHAT}}\",\r\n            \"network.log_server_actions\": \"{{server.build.env.LOG_SERVER_ACTIONS}}\",\r\n            \"network.pause_server_if_no_clients\": \"{{server.build.env.PAUSE_NO_CLIENTS}}\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Listening for clients on\"\r\n}",
+        "logs": "{}",
+        "stop": "^C^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n\r\n## File: Pterodactyl OpenRCT2 Egg - egg-openrct2.json\r\n## Authors: David Wolfe (Red-Thirten), parkervcp\r\n## Date: 2022\/01\/12\r\n## License: MIT License\r\n\r\nGITHUB_PACKAGE=\"OpenRCT2\/OpenRCT2\"\r\nMATCH=\"linux-bullseye-x86_64.tar.gz\"\r\nDEFAULT_SAVE=\"https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/game_eggs\/tycoon_games\/openrct2\/save.park\"\r\n\r\n## OpenRCT2 Install\r\napt -y update\r\n[ ! -d \/mnt\/server ] && mkdir \/mnt\/server\r\ncd \/mnt\/server\r\n# Remove existing installation if present\r\n[ -d OpenRCT2 ] && rm -rf OpenRCT2\r\n\r\n# Determine if installing from source or from release\r\nif [ \"${VERSION}\" == \"develop\" ]; then\r\n    # Get required packages\r\n    apt -y install curl git make cmake gcc build-essential libicu-dev pkg-config libcurl4-openssl-dev libcrypto++-dev libpng-dev libssl-dev libzip-dev duktape-dev nlohmann-json3-dev\r\n    echo -e \"\\nInstalling\/Updating OpenRCT2 from source...\\n\"\r\n    # Setup temp directory for building and move to it\r\n    [ -d temp ] && rm -rf temp\r\n    mkdir temp && cd temp\r\n    # Clone the branch and check if successful\r\n    git clone --branch \"${VERSION}\" https:\/\/github.com\/${GITHUB_PACKAGE}\r\n    if [ ! -d OpenRCT2 ]; then\r\n        echo -e \"\\nFailed to clone \\\"${VERSION}\\\" branch from https:\/\/github.com\/${GITHUB_PACKAGE}\\n\"\r\n        exit 1\r\n    fi\r\n    cd OpenRCT2\r\n    mkdir build && cd build\r\n    # Prepare CMake files for a lightweight and CLI-only build of OpenRCT2, using the appropriate flags\r\n    cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DPORTABLE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_FLAGS=\"-g -gz\" -DDISABLE_TTF=ON -DDISABLE_GOOGLE_BENCHMARK=ON -DDISABLE_DISCORD_RPC=ON -DDISABLE_GUI=ON\r\n    echo -e \"\\nBuilding OpenRCT2 package from source...\\n\\tThis process can take quite some time. Grab a coffee :)\\n\"\r\n    # Build OpenRCT2\r\n    DESTDIR=. make install\r\n    # Check if build was successful and move to it\r\n    if [ ! -d usr\/local ]; then\r\n        echo -e \"\\nFailed to successfully build OpenRCT2!\\n\"\r\n        exit 1\r\n    fi\r\n    cd usr\/local\r\n    # Make executable-ready package by moving compiled files to the correct locations\r\n    mkdir -p \/mnt\/server\/OpenRCT2\/data\r\n    mv bin\/* \/mnt\/server\/OpenRCT2\/\r\n    mv share\/openrct2\/* share\/openrct2-cli\/* \/mnt\/server\/OpenRCT2\/data\/\r\n    mv share\/doc \/mnt\/server\/OpenRCT2\/\r\n    cd \/mnt\/server\r\n    rm -rf temp # Clean up temp building directory\r\n    echo -e \"\\nBuild of OpenRCT2 package complete!\"\r\nelse\r\n    # Get required packages\r\n    apt install -y curl jq\r\n    echo -e \"\\nInstalling\/Updating OpenRCT2 from release tag \\\"${VERSION}\\\"...\\n\"\r\n    # This is a simple script to use the GitHub API for release versions.\r\n    # This requires the egg has a variable for GITHUB_PACKAGE, VERSION and MATCH (MATCH is to match the filename in some way).\r\n    # Get release info and download links\r\n    LATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\/latest\")\r\n    RELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/${GITHUB_PACKAGE}\/releases\")\r\n\r\n    if [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\n    else\r\n        VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n        if [ \"${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n            DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n        else\r\n            DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n        fi\r\n    fi\r\n    # Download and unpackage the release\r\n    curl -L ${DOWNLOAD_URL} | tar -xzv\r\n    # Check if it was successful\r\n    if [ -d OpenRCT2 ]; then\r\n        echo -e \"\\nDownload of OpenRCT2 release successful!\"\r\n    else\r\n        echo -e \"\\nFailed to download\/unpack file: ${DOWNLOAD_URL}\\n\"\r\n        exit 1\r\n    fi\r\nfi\r\n\r\n## OpenRCT2 Setup\r\n# Setup ServerData\/save directory\r\n[ ! -d ServerData\/save ] && mkdir -p ServerData\/save\r\ncd ServerData\/save\r\n# Download default save.park if missing\r\nif [ ! -f save.park ]; then\r\n    echo -e \"Downloading default save.park file from ${DEFAULT_SAVE}\"\r\n    curl -sSLO ${DEFAULT_SAVE}\r\nfi\r\n\r\necho -e \"\\nOpenRCT2 Successfully Installed!\"",
+            "container": "debian:bullseye-slim",
+            "entrypoint": "\/bin\/bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Save File",
+            "description": "Save file (.sv4 \/ .sv6 \/ .park) to load. Can be a file path or can be a webhosted file URL. An existing save file must be specified; the server cannot generate a new scenario\/save from scratch.",
+            "env_variable": "SAVE_URI",
+            "default_value": "ServerData\/save\/save.park",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|min:4"
+        },
+        {
+            "name": "Load Latest Autosave",
+            "description": "Will load the latest autosave (assuming one is present) *instead* of the Save File when the server is started. Useful for loading the latest progress of a park after a reboot. Set to \"false\" to \"lock\" progress of the park, and always load the original Save File on start up.",
+            "env_variable": "LOAD_AUTOSAVE",
+            "default_value": "true",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Autosave Interval",
+            "description": "0 = Every 1 min, 1 = Every 5 min, 2 = Every 15 min, 3 = Every 30 min, 4 = Every hour, 5 = Never",
+            "env_variable": "AUTOSAVE_INTERVAL",
+            "default_value": "1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer|between:0,5"
+        },
+        {
+            "name": "Autosaves To Keep",
+            "description": "Number of autosaves to keep before rolling over and deleting the oldest one. Set to 0 to disable autosaving.",
+            "env_variable": "AUTOSAVE_AMOUNT",
+            "default_value": "10",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer|min:0"
+        },
+        {
+            "name": "Max Players",
+            "description": "Maximum players allowed to connect to the server.",
+            "env_variable": "MAX_PLAYERS",
+            "default_value": "16",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|integer|min:0"
+        },
+        {
+            "name": "Server Password",
+            "description": "Password requested by the server for clients to connect. Admins do not have to enter password to join. Leave empty for no password.",
+            "env_variable": "SERVER_PASSWORD",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Advertise Server",
+            "description": "If set to \"false\", the server will not be advertised in the master server list, and clients must manually connect.",
+            "env_variable": "SERVER_ADVERTISE",
+            "default_value": "true",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Pause Server If No Clients",
+            "description": "Set to \"true\" to have the server pause simulation if no clients are on the server.",
+            "env_variable": "PAUSE_NO_CLIENTS",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Server Name",
+            "description": "Name of the server that appears in the server list.",
+            "env_variable": "SERVER_NAME",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Server Description",
+            "description": "Description of the server that appears when hovering over the server in the server list.",
+            "env_variable": "SERVER_DESCRIPTION",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Server Player Name",
+            "description": "The server appears as a player in the player list. This is the name it will have.",
+            "env_variable": "SERVER_PLAYER_NAME",
+            "default_value": "Server",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Server Greeting",
+            "description": "The \"Message of the Day\" that gets sent to all clients who join.",
+            "env_variable": "SERVER_GREETING",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Provider Name",
+            "description": "Server provider name that appears in server information window.",
+            "env_variable": "PROVIDER_NAME",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Server Provider E-Mail",
+            "description": "Server provider e-mail that appears in server information window.",
+            "env_variable": "PROVIDER_EMAIL",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Server Provider Website",
+            "description": "Server provider website that appears in server information window.",
+            "env_variable": "PROVIDER_WEBSITE",
+            "default_value": "",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "string|nullable"
+        },
+        {
+            "name": "Log Chat",
+            "description": "Set to \"true\" if you would like in-game chat logged to file in Data\/chatlogs.",
+            "env_variable": "LOG_CHAT",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "Log Server Actions",
+            "description": "Set to \"true\" if you would like in-game actions logged to file in Data\/serverlogs.",
+            "env_variable": "LOG_SERVER_ACTIONS",
+            "default_value": "false",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|in:true,false"
+        },
+        {
+            "name": "OpenRCT2 Version",
+            "description": "The release tag (version) of OpenRCT2 to download and install from their official Github (ie. \"v0.3.5.1\"). Use \"latest\" to download the latest release, or \"develop\" to build from the latest source (takes longer to install but is the most up to date).",
+            "env_variable": "VERSION",
+            "default_value": "develop",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|min:1"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/game_eggs/tycoon_games/openrct2/save.park b/game_eggs/tycoon_games/openrct2/save.park
new file mode 100644
index 00000000..a634de47
Binary files /dev/null and b/game_eggs/tycoon_games/openrct2/save.park differ
diff --git a/game_eggs/tycoon_games/openttd/README.md b/game_eggs/tycoon_games/openttd/README.md
index 90f44417..c00a8280 100644
--- a/game_eggs/tycoon_games/openttd/README.md
+++ b/game_eggs/tycoon_games/openttd/README.md
@@ -1,4 +1,4 @@
-# OpenTTD (https://www.openttd.org)
+# [OpenTTD](https://www.openttd.org)
 
 OpenTTD is a business simulation game in which players try to earn money via transporting passengers and freight by road, rail, water and air. It is an open-source remake and expansion of the 1995 Chris Sawyer video game Transport Tycoon Deluxe
 
diff --git a/game_eggs/veloren/README.md b/game_eggs/veloren/README.md
index 18f0040e..df3bdcd6 100644
--- a/game_eggs/veloren/README.md
+++ b/game_eggs/veloren/README.md
@@ -1,10 +1,13 @@
 # Veloren
-### From their [Site](https://veloren.net/)
+
+## From their [Site](https://veloren.net/)
+
 Veloren is a multiplayer voxel RPG written in Rust. It is inspired by games such as Cube World, Legend of Zelda: Breath of the Wild, Dwarf Fortress and Minecraft.
 
 Veloren is fully open-source, licensed under GPL 3. It uses original graphics, musics and other assets created by its community. Being contributor-driven, its development community and user community is one and the same: developers, players, artists and musicians come together to develop the game.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
@@ -12,4 +15,4 @@ Ports required to run the server in a table format.
 | Game    | 14004   |
 | Metrics | 14005   |
 
-#### Mods/Plugins may require ports to be added to the server.
+### Mods/Plugins may require ports to be added to the server
diff --git a/game_eggs/veloren/egg-veloren.json b/game_eggs/veloren/egg-veloren.json
index 689fb7be..d4bda0d7 100644
--- a/game_eggs/veloren/egg-veloren.json
+++ b/game_eggs/veloren/egg-veloren.json
@@ -13,7 +13,7 @@
         "quay.io\/parkervcp\/pterodactyl-images:base_debian"
     ],
     "file_denylist": [],
-    "startup": ".\/veloren-server-cli -b",
+    "startup": ".\/veloren-server-cli",
     "config": {
         "files": "{\r\n    \"userdata\/server\/server_config\/settings.ron\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"    gameserver_address\": \"    gameserver_address: \\\"0.0.0.0:{{server.build.default.port}}\\\",\",\r\n\t    \"    server_name\": \"    server_name: \\\"{{server.build.env.SERVER_NAME}}\\\",\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"Server is ready to accept connections\"\r\n}",
@@ -28,4 +28,4 @@
         }
     },
     "variables": []
-}
\ No newline at end of file
+}
diff --git a/game_eggs/vintage_story/README.md b/game_eggs/vintage_story/README.md
index 4bffe25f..827a8b9c 100644
--- a/game_eggs/vintage_story/README.md
+++ b/game_eggs/vintage_story/README.md
@@ -1,18 +1,20 @@
 # Vintage Story
 
-#### The Vintage Story Server
+## The Vintage Story Server
+
 The server supports mods
 
-#### from the developers
+### from the developers
 
 Vintage Story is an uncompromising wilderness survival sandbox game inspired by lovecraftian horror themes.
 Find yourself in a ruined world reclaimed by nature and permeated by unnerving temporal disturbances.
 Relive the advent of human civilization, or take your own path.
 New to the game? Make sure to checkout their [starter page](https://wiki.vintagestory.at/index.php?title=Main_Page).
 
-### Server Ports
-Vintage Story requires a single port  
+## Server Ports
+
+Vintage Story requires a single port
 
 | Port    | default |
 |---------|---------|
-| Game    | 42420   |
\ No newline at end of file
+| Game    | 42420   |
diff --git a/game_eggs/vintage_story/vintage_story/egg-vintage-story.json b/game_eggs/vintage_story/egg-vintage-story.json
similarity index 100%
rename from game_eggs/vintage_story/vintage_story/egg-vintage-story.json
rename to game_eggs/vintage_story/egg-vintage-story.json
diff --git a/game_eggs/wine/generic/README.md b/game_eggs/wine/generic/README.md
index 82294b1d..8164f636 100644
--- a/game_eggs/wine/generic/README.md
+++ b/game_eggs/wine/generic/README.md
@@ -1,8 +1,10 @@
 # Wine Generic
-A generic wine image that can be used to install servers that need wine to run.  
+
+A generic wine image that can be used to install servers that need wine to run.
 Downloads compressed server files and extracts them to a specified folder in `/mnt/server/`
 
 I.E. `INSTALL_DIR` = `server/folder` will unpack the server into `/mnt/server//server/folder/`
 
-### Install notes
-May require a full custom start command. This is on you to figure out what that is.
\ No newline at end of file
+## Install notes
+
+May require a full custom start command. This is on you to figure out what that is.
diff --git a/game_eggs/wine/generic/egg-wine-generic.json b/game_eggs/wine/generic/egg-wine-generic.json
index d331311e..188fdd45 100644
--- a/game_eggs/wine/generic/egg-wine-generic.json
+++ b/game_eggs/wine/generic/egg-wine-generic.json
@@ -4,14 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-04-28T02:09:55+00:00",
+    "exported_at": "2021-12-16T15:06:26+01:00",
     "name": "Wine Generic",
     "author": "parker@parkervcp.com",
     "description": "a generic egg to run servers with wine",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_wine-5",
-        "quay.io\/parkervcp\/pterodactyl-images:debian_wine-4"
+        "ghcr.io\/parkervcp\/yolks:wine_latest"
     ],
     "file_denylist": [],
     "startup": "wine {{SERVER_EXECUTABLE}}",
@@ -24,7 +23,7 @@
     "scripts": {
         "installation": {
             "script": "#!\/bin\/bash\r\n# The wine generic server installer\r\n# This will just pull a download link and unpack it in directory if specified.\r\n\r\napt update -y\r\napt install -y curl file unzip\r\n\r\nif [ ! -d \/mnt\/server ]; then\r\n    mkdir -p \/mnt\/server\/\r\nfi\r\n\r\ncd \/mnt\/server\/\r\n\r\n# if an install dir is set then make it and change to it.\r\nif [ ! -z ${INSTALL_DIR} ]; then\r\n    mkdir -p ${INSTALL_DIR}\r\n    cd ${INSTALL_DIR}\r\nfi\r\n\r\n# validate server link\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\ncurl -sSL ${DOWNLOAD_LINK} -o ${DOWNLOAD_LINK##*\/}\r\n\r\n# unpack servver files\r\nFILETYPE=$(file -F ',' ${DOWNLOAD_LINK##*\/} | cut -d',' -f2 | cut -d' ' -f2)\r\n\r\nif [ \"$FILETYPE\" == \"gzip\" ]; then\r\n    tar xzvf ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"Zip\" ]; then\r\n    unzip ${DOWNLOAD_LINK##*\/}\r\nelif [ \"$FILETYPE\" == \"XZ\" ]; then\r\n    tar xvf ${DOWNLOAD_LINK##*\/}\r\nelse\r\n    echo -e \"unknown filetype. Exiting\"\r\n    exit 2 \r\nfi",
-            "container": "debian:buster-slim",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
diff --git a/game_eggs/xonotic/xonotic/README.md b/game_eggs/xonotic/xonotic/README.md
index 6709ce40..0a17db03 100644
--- a/game_eggs/xonotic/xonotic/README.md
+++ b/game_eggs/xonotic/xonotic/README.md
@@ -2,7 +2,8 @@
 
 The Free and Fast Arena Shooter
 
-### Server Ports
+## Server Ports
+
 Xonotic requires 1 port
 
 | Port  | default |
diff --git a/game_eggs/xonotic/xonotic/egg-xonotic.json b/game_eggs/xonotic/xonotic/egg-xonotic.json
index 4fa357c9..4817c6a8 100644
--- a/game_eggs/xonotic/xonotic/egg-xonotic.json
+++ b/game_eggs/xonotic/xonotic/egg-xonotic.json
@@ -1,24 +1,29 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2018-02-23T15:46:08-05:00",
+    "exported_at": "2021-11-24T07:45:11+00:00",
     "name": "Xonotic",
     "author": "parker@parkervcp.com",
     "description": "This is for the default xonotic setup.",
-    "image": "quay.io\/pterodactyl\/core:source",
+    "features": null,
+    "images": [
+        "ghcr.io\/pterodactyl\/games:source"
+    ],
+    "file_denylist": [],
     "startup": ".\/xonotic-linux64-dedicated +log_file latest.log +net_address 0.0.0.0 +port {{SERVER_PORT}} +maxplayers {{MAX_PLAYERS}}",
     "config": {
-        "files": "{\r\n    \"tshock\/config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {}\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Server listening on address 0.0.0.0:\",\r\n    \"userInteraction\": []\r\n}",
-        "logs": "{\r\n    \"custom\": true,\r\n    \"location\": \"logs\/latest.log\"\r\n}",
-        "stop": "^C"
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"Server listening on address 0.0.0.0:\"\r\n}",
+        "logs": "{}",
+        "stop": "quit"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Vanilla Xonotic Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add rsync --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nwget http:\/\/dl.xonotic.org\/xonotic-0.8.2.zip\r\n\r\nunzip xonotic-0.8.2.zip\r\n\r\nmv Xonotic\/* .\/\r\n\r\n.\/misc\/tools\/rsync-updater\/update-to-autobuild.sh\r\n\r\nrm -rf COPYING Makefile *glx* *glx *sdl* *sdl *linux32* *exe *.app *.sh bin* GPL* Docs\/ gmqcc\/ source\/ misc\/ Xonotic\/ xonotic-0.8.2.zip",
-            "container": "alpine:3.9",
+            "script": "#!\/bin\/ash\r\n# Vanilla Xonotic Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add rsync --no-cache\r\n\r\ncd \/mnt\/server\r\n\r\nwget http:\/\/dl.xonotic.org\/xonotic-0.8.2.zip\r\n\r\nunzip xonotic-0.8.2.zip\r\n\r\nmv Xonotic\/* .\/\r\n\r\n.\/misc\/tools\/rsync-updater\/update-to-autobuild.sh\r\n\r\n# create initial folder structure to copy the default config to, because it only gets created on first startup\r\nmkdir -p .xonotic\/data\r\ncp-n server\/server.cfg .xonotic\/data\/server.cfg || true # do not overwrite existing config file\r\n\r\nrm -rf COPYING Makefile *glx* *glx *sdl* *sdl *linux32* *exe *.app *.sh bin* GPL* Docs\/ gmqcc\/ source\/ misc\/ Xonotic\/ xonotic-0.8.2.zip",
+            "container": "ghcr.io\/pterodactyl\/installers:alpine",
             "entrypoint": "ash"
         }
     },
@@ -28,9 +33,9 @@
             "description": "Max players allowed on the server",
             "env_variable": "MAX_PLAYERS",
             "default_value": "16",
-            "user_viewable": 1,
-            "user_editable": 0,
-            "rules": "required|numeric|digits_between:1,3"
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|numeric|digits_between:1,2"
         }
     ]
 }
diff --git a/minecraft/README.md b/minecraft/README.md
index 52c0ecaa..802a7e10 100644
--- a/minecraft/README.md
+++ b/minecraft/README.md
@@ -1,3 +1,3 @@
-## All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft)
+# All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft)
 
-This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here.
\ No newline at end of file
+This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here.
diff --git a/minecraft/java/README.md b/minecraft/java/README.md
index 52c0ecaa..802a7e10 100644
--- a/minecraft/java/README.md
+++ b/minecraft/java/README.md
@@ -1,3 +1,3 @@
-## All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft)
+# All Minecraft eggs have been migrated to a [new game_eggs folder.](https://github.com/parkervcp/eggs/tree/master/game_eggs/minecraft)
 
-This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here.
\ No newline at end of file
+This folder is only kept for backward compatibility for eggs that are downloading server.properties file from here.
diff --git a/monitoring/prometheus/README.md b/monitoring/prometheus/README.md
index 4766566b..b741ab7f 100644
--- a/monitoring/prometheus/README.md
+++ b/monitoring/prometheus/README.md
@@ -1,14 +1,17 @@
 # Prometheus
 
-### From the [Prometheus](https://github.com/prometheus/prometheus) GitHub repository
+## From the [Prometheus](https://github.com/prometheus/prometheus) GitHub repository
+
 The Prometheus monitoring system and time series database.
 
-### Resource consumption
+## Resource consumption
+
 As Prometheus is a monitoring software that saves data in a timeseries database, it can take up massive amounts of disk space. Due to Prometheus design, a huge memory consumption is also possible.
 To get started, a minimum of 3GB RAM and >=2.5GB disk space is recommended.
 Keep in mind that those numbers can grow pretty quick for large monitored environments!
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port              | default |
diff --git a/monitoring/prometheus/egg-prometheus.json b/monitoring/prometheus/egg-prometheus.json
index af98fd18..3376353b 100644
--- a/monitoring/prometheus/egg-prometheus.json
+++ b/monitoring/prometheus/egg-prometheus.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-07T19:53:13+02:00",
+    "exported_at": "2022-01-22T05:45:16-05:00",
     "name": "Prometheus",
     "author": "p.zarrad@outlook.de",
     "description": "The Prometheus monitoring system and time series database.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/prometheus --web.listen-address=0.0.0.0:{{SERVER_PORT}} --config.file=\/home\/container\/prometheus.yml --storage.tsdb.path=\/home\/container\/data --web.console.templates=\/home\/container\/consoles --web.console.libraries=\/home\/container\/console_libraries --web.config.file=\/home\/container\/prometheus.web.yml",
diff --git a/scripts/steamcmd_installer.sh b/scripts/steamcmd_installer.sh
index 7035e145..c03a2bc0 100644
--- a/scripts/steamcmd_installer.sh
+++ b/scripts/steamcmd_installer.sh
@@ -2,20 +2,24 @@
 # steamcmd Base Installation Script
 #
 # Server Files: /mnt/server
-# Image to install with is 'debian:buster-slim'
+# Image to install with is 'ghcr.io/parkervcp/installers:debian'
 
 ##
 #
 # Variables
 # 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.
 # WINDOWS_INSTALL - if it's a windows server you want to install set to 1
-# SRCDS_APPID - steam app id ffound here - https://developer.valvesoftware.com/wiki/Dedicated_Servers_List
-# INSTALL_FLAGS - when a server has extra glas for things like beta installs or updates.
+# SRCDS_APPID - steam app id found here - https://developer.valvesoftware.com/wiki/Dedicated_Servers_List
+# SRCDS_BETAID - beta branch of a steam app. Leave blank to install normal branch
+# SRCDS_BETAPASS - password for a beta branch should one be required during private or closed testing phases.. Leave blank for no password.
+# INSTALL_FLAGS - Any additional SteamCMD  flags to pass during install.. Keep in mind that steamcmd auto update process in the docker image might overwrite or ignore these when it performs update on server boot.
+# AUTO_UPDATE - Adding this variable to the egg allows disabling or enabling automated updates on boot. Boolean value. 0 to disable and 1 to enable.
 #
-##
+ ##
 
+# Install packages. Default packages below are not required if using our existing install image thus speeding up the install process.
 apt -y update
-apt -y --no-install-recommends install curl lib32gcc1 ca-certificates
+apt -y --no-install-recommends install curl lib32gcc-s1 ca-certificates
 
 ## just in case someone removed the defaults.
 if [[ "${STEAM_USER}" == "" ]] || [[ "${STEAM_PASS}" == "" ]]; then
@@ -42,7 +46,7 @@ chown -R root:root /mnt
 export HOME=/mnt/server
 
 ## install game using steamcmd
-./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} ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6
+./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} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) ${INSTALL_FLAGS} validate +quit ## other flags may be needed depending on install. looking at you cs 1.6
 
 ## set up 32 bit libraries
 mkdir -p /mnt/server/.steam/sdk32
diff --git a/software/code-server/README.md b/software/code-server/README.md
index f1863224..2665a786 100644
--- a/software/code-server/README.md
+++ b/software/code-server/README.md
@@ -1,6 +1,6 @@
 # Code-Server
 
-### From the [Code-Server](https://github.com/cdr/code-server) GitHub
+## From the [Code-Server](https://github.com/cdr/code-server) GitHub
 
 Run [VS Code](https://github.com/Microsoft/vscode) on any machine anywhere and access it in the browser.
 
diff --git a/software/code-server/egg-code--server.json b/software/code-server/egg-code--server.json
index 18f9d9f7..8820b7eb 100644
--- a/software/code-server/egg-code--server.json
+++ b/software/code-server/egg-code--server.json
@@ -4,13 +4,16 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-05-03T21:06:19+03:00",
+    "exported_at": "2021-12-17T09:23:57+00:00",
     "name": "Code-Server",
     "author": "mario.franze@gmail.com",
     "description": "Run VS Code on any machine anywhere and access it in the browser.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-14"
+        "ghcr.io\/parkervcp\/yolks:nodejs_17",
+        "ghcr.io\/parkervcp\/yolks:nodejs_16",
+        "ghcr.io\/parkervcp\/yolks:nodejs_14",
+        "ghcr.io\/parkervcp\/yolks:nodejs_12"
     ],
     "file_denylist": [],
     "startup": "sh .local\/lib\/code-server-{{VERSION}}\/bin\/code-server",
@@ -18,12 +21,12 @@
         "files": "{\r\n    \".config\/code-server\/config.yaml\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"password\": \"password: {{server.build.env.PASSWORD}}\",\r\n            \"bind-addr\": \"bind-addr: 0.0.0.0:{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \"HTTP server listening on\"\r\n}",
         "logs": "{}",
-        "stop": "^C"
+        "stop": "^^C"
     },
     "scripts": {
         "installation": {
-            "script": "apt update\r\napt install -y curl jq\r\nMATCH=linux-amd64\r\n\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/cdr\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/cdr\/code-server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-amd64 \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"",
-            "container": "debian:buster-slim",
+            "script": "apt update\r\napt install -y curl jq\r\nMATCH=linux-amd64\r\n\r\n# Create initial directories\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\n# Create needed directories\r\nmkdir -p \/mnt\/server\/.local\/lib \/mnt\/server\/.local\/bin \/mnt\/server\/.config\/code-server \/mnt\/server\/projects\r\n\r\n# Change permission of projects directory so it can be accessed by code-server\r\nchmod 777 \/mnt\/server\/projects\r\ntouch \"\/mnt\/server\/projects\/PLACE YOUR PROJECTS HERE\"\r\n\r\n# Check for available versions. Defaults to latest if no valid version is found.\r\nLATEST_JSON=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/releases\/latest\")\r\nRELEASES=$(curl --silent \"https:\/\/api.github.com\/repos\/coder\/code-server\/releases\")\r\n\r\nif [ -z \"${VERSION}\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url | grep -i ${MATCH})\r\nelse\r\n    VERSION_CHECK=$(echo ${RELEASES} | jq -r --arg VERSION \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .tag_name')\r\n    if [ \"v${VERSION}\" == \"${VERSION_CHECK}\" ]; then\r\n        DOWNLOAD_URL=$(echo ${RELEASES} | jq -r --arg VERSION \"v${VERSION}\" '.[] | select(.tag_name==$VERSION) | .assets[].browser_download_url' | grep -i ${MATCH})\r\n    else\r\n        echo -e \"defaulting to latest release\"\r\n        DOWNLOAD_URL=$(echo ${LATEST_JSON} | jq .assets | jq -r .[].browser_download_url)\r\n    fi\r\nfi\r\n\r\n# Download the given Version and extract it\r\necho \"Downloading $DOWNLOAD_URL\"\r\ncurl -fL $DOWNLOAD_URL | tar -C \/mnt\/server\/.local\/lib -xz\r\nmv \/mnt\/server\/.local\/lib\/code-server-*linux-amd64 \/mnt\/server\/.local\/lib\/code-server-${VERSION}\r\n\r\n\r\nPATH=\"\/mnt\/server\/.local\/bin:$PATH\"\r\necho \"password: changeme\r\nbind-addr: 0.0.0.0\r\nauth: password\r\ncert: false\" > \/mnt\/server\/.config\/code-server\/config.yaml\r\n\r\necho \"Install complete\"",
+            "container": "ghcr.io/parkervcp/installers:debian",
             "entrypoint": "bash"
         }
     },
diff --git a/software/elasticsearch/README.md b/software/elasticsearch/README.md
new file mode 100644
index 00000000..9b140f95
--- /dev/null
+++ b/software/elasticsearch/README.md
@@ -0,0 +1,17 @@
+# Elasticsearch
+
+## From the [Elasticsearch](https://github.com/elastic/elasticsearch) GitHub
+
+Run [Elasticsearch](https://github.com/elastic/elasticsearch) on any machine anywhere and access it in the browser.
+
+## vm.max_map_count requirement
+
+Please follow this for the vm.max_map_count requirement: <https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html#_set_vm_max_map_count_to_at_least_262144>
+
+## Server Ports
+
+Ports required to run the server in a table format.
+
+| Port | default |
+| ---- | ------- |
+| Game | 9200    |
diff --git a/software/elasticsearch/egg-elasticsearch.json b/software/elasticsearch/egg-elasticsearch.json
new file mode 100644
index 00000000..47938199
--- /dev/null
+++ b/software/elasticsearch/egg-elasticsearch.json
@@ -0,0 +1,50 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1",
+        "update_url": null
+    },
+    "exported_at": "2021-07-27T08:27:04-05:00",
+    "name": "Elasticsearch",
+    "author": "dominic@stilma.net",
+    "description": null,
+    "features": null,
+    "images": [
+        "quay.io\/parkervcp\/pterodactyl-images:ubuntu"
+    ],
+    "file_denylist": [],
+    "startup": ".\/bin\/elasticsearch -E network.host=0.0.0.0 -E http.port={{SERVER_PORT}} -E discovery.type={{DISCOVERY_SEED_HOSTS}}",
+    "config": {
+        "files": "{}",
+        "startup": "{\r\n    \"done\": \"started\"\r\n}",
+        "logs": "{}",
+        "stop": "^C"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#!\/bin\/bash\r\n# Elasticsearch Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Install Requirements\r\n\r\napt update\r\napt install -y jq ca-certificates gnupg2 wget tar curl\r\n\r\ncd \/mnt\/server\r\n\r\n## Install Elasticsearch\r\nwget https:\/\/artifacts.elastic.co\/downloads\/elasticsearch\/elasticsearch-$VERSION-linux-x86_64.tar.gz\r\ntar -zxf elasticsearch-*-linux-x86_64.tar.gz --directory \/mnt\/server\r\nmv elasticsearch*\/* \/mnt\/server\r\nrm elasticsearch-*-linux-x86_64.tar.gz\r\nrm -R elasticsearch-*\r\n\r\n## Finish command\r\necho \"All done! Just start it up :)\"",
+            "container": "debian:buster-slim",
+            "entrypoint": "bash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Discovery Seed Hosts",
+            "description": "Please keep default if you are unsure.",
+            "env_variable": "DISCOVERY_SEED_HOSTS",
+            "default_value": "single-node",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required"
+        },
+        {
+            "name": "Elasticsearch Version",
+            "description": "Go to https:\/\/www.elastic.co\/downloads\/elasticsearch and look at the version at the top.",
+            "env_variable": "VERSION",
+            "default_value": "7.15.1",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:20"
+        }
+    ]
+}
diff --git a/software/gitea/README.md b/software/gitea/README.md
index 3431606c..7f555ba8 100644
--- a/software/gitea/README.md
+++ b/software/gitea/README.md
@@ -1,11 +1,12 @@
 # Gitea
+
 [Gitea](https://gitea.io/en-us/) is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.
 
-### Server Ports
+## Server Ports
 
 Ports required to run the server in a table format.
 
 | Port | default |
 | ---- | ------- |
 | App  | 3000    |
-| SSH  | 2020    |
\ No newline at end of file
+| SSH  | 2020    |
diff --git a/software/grafana/README.md b/software/grafana/README.md
index 31ffddcb..53200083 100644
--- a/software/grafana/README.md
+++ b/software/grafana/README.md
@@ -1,20 +1,24 @@
 # Grafana
 
-### From the [Grafana](https://github.com/grafana/grafana) GitHub
+## From the [Grafana](https://github.com/grafana/grafana) GitHub
+
 The open and composable observability and data visualization platform.
 Visualize metrics, logs, and traces from multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, Postgres and many more.
 
-### Initial credentials
-After the first start of Grafana, you can login using the following credentials:
- - Username: admin
- - Password: admin
+## Initial credentials
+
+After the first start of Grafana, you can login using the following credentials:
+
+- Username: admin
+- Password: admin
+
+## Update support
 
-### Update support
 The egg _should_ keep the data and conf folder when reinstalling. Therefore a reinstallation with "latest" as the selected version can be used to update Grafana.
 
 If you want to reset the server completly, remove the `conf` and `data` directories manually before reinstalling.
 
-### Server Ports
+## Server Ports
 
 Ports required to run the server in a table format.
 
diff --git a/software/grafana/egg-grafana.json b/software/grafana/egg-grafana.json
index 6b2312d4..d60ddf7f 100644
--- a/software/grafana/egg-grafana.json
+++ b/software/grafana/egg-grafana.json
@@ -4,13 +4,13 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-07-06T23:52:45+02:00",
+    "exported_at": "2022-01-22T05:46:01-05:00",
     "name": "Grafana",
     "author": "p.zarrad@outlook.de",
     "description": "The open and composable observability and data visualization platform.\r\nVisualize metrics, logs, and traces from multiple sources like Prometheus, Loki, Elasticsearch, InfluxDB, Postgres and many more.",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:base_debian"
+        "ghcr.io\/parkervcp\/yolks:debian"
     ],
     "file_denylist": [],
     "startup": ".\/bin\/grafana-server web",
diff --git a/software/haste-server/README.md b/software/haste-server/README.md
index 3d2e1881..b337cb5f 100644
--- a/software/haste-server/README.md
+++ b/software/haste-server/README.md
@@ -1,8 +1,13 @@
 # haste-server
-### Their [Github](https://github.com/seejohnrun/haste-server)
+
+## Their [Github](https://github.com/seejohnrun/haste-server)
+
 Host your own [Hastebin](https://hastebin.com).
-### Server Ports
+
+## Server Ports
+
 Ports required to run the server in a table format.
+
 | Port | default |
 | ---- | ------- |
 | Game | 7777    |
diff --git a/software/haste-server/egg-haste-server.json b/software/haste-server/egg-haste-server.json
index d913ef5c..bc805f14 100644
--- a/software/haste-server/egg-haste-server.json
+++ b/software/haste-server/egg-haste-server.json
@@ -10,7 +10,7 @@
     "description": "Haste is an open-source pastebin software written in node.js, which is easily installable in any network. It can be backed by either redis or filesystem, and has a very easy adapter interface for other stores. A publicly available version can be found at hastebin.com",
     "features": null,
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_nodejs-12"
+        "ghcr.io/parkervcp/yolks:nodejs_12"
     ],
     "startup": "npm start",
     "config": {
@@ -21,8 +21,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y git curl\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/seejohnrun\/haste-server\r\ncd haste-server\r\nmv * \/mnt\/server\r\ncd ..\r\nrm -rf haste-server\r\nnpm install\r\n\r\nexit 0",
-            "container": "node:12-buster-slim",
+            "script": "#!\/bin\/bash\r\n\r\napt update\r\napt install -y git curl\r\nmkdir -p \/mnt\/server\r\ncd \/mnt\/server\r\n\r\ngit clone https:\/\/github.com\/toptal\/haste-server\r\ncd haste-server\r\nmv * \/mnt\/server\r\ncd ..\r\nrm -rf haste-server\r\nnpm install\r\n\r\nexit 0",
+            "container": "node:12-bullseye-slim",
             "entrypoint": "bash"
         }
     },
diff --git a/software/rabbitmq/README.md b/software/rabbitmq/README.md
index 6fddaf19..8679398e 100644
--- a/software/rabbitmq/README.md
+++ b/software/rabbitmq/README.md
@@ -1,32 +1,36 @@
 # RabbitMQ
 
-### From the [RabbitMQ](https://www.rabbitmq.com/) website
+## From the [RabbitMQ](https://www.rabbitmq.com/) website
+
 RabbitMQ is the most widely deployed open source message broker.
 
-### Installation
+## Installation
+
 Follow the common egg installation guide to install the egg on your Pterodactyl instance.
 When setting up a server, the latest RabbitMQ version will be used by default.
 
 With pretty new and old versions of RabbitMQ, you might have to adjust the used Erlang version.
 This can be archived by adjusting the version number of the used image (e. g. `ghcr.io/pterodactyl/yolks:erlang_22` instead of `ghcr.io/parkervcp/yolks:erlang_24`).
 
-### Configuration
+## Configuration
+
 Configuring RabbitMQ in Pterodactyl is only possible using the config files.
 This means:
- - Configure the server itself as normal using `/home/container/etc/rabbitmq/rabbitmq.conf`
- - Enable plugins using the plugin file located at `/home/container/etc/rabbitmq/enabled_plugins`
- - Configure users and vhosts through a [definitions.json](https://www.rabbitmq.com/definitions.html)
+
+- Configure the server itself as normal using `/home/container/etc/rabbitmq/rabbitmq.conf`
+- Enable plugins using the plugin file located at `/home/container/etc/rabbitmq/enabled_plugins`
+- Configure users and vhosts through a [definitions.json](https://www.rabbitmq.com/definitions.html)
 
 You can set the path to the used `definitions.json` using the `load_definitions` option in your config.
 Note that RabbitMQ versions prior to 3.8.6 will require a properly configured management plugin to do so!
-The easiest way to get a working `definitions.json` is to setup a local instance with the 
-management plugin. You can configure your instance there and load the definitions as stated by uploading them.
+The easiest way to get a working `definitions.json` is to setup a local instance with the management plugin. You can configure your instance there and load the definitions as stated by uploading them.
 
-By default, only `listeners.tcp.default` is configured to match your primary allocation. 
+By default, only `listeners.tcp.default` is configured to match your primary allocation.
 If you want to expose some other port (e. g. the web management interface) you have to manually configure the
 port in your `rabbitmq.conf`.
 
-### Update support
+## Update support
+
 The egg _should_ keep the `etc` folder when reinstalling, to prevent destroying the configuration by accident. Therefore a reinstallation with "latest" as the selected version can be used to update RabbitMQ.
 
 If you want to reset the server completly, remove the `etc` directory manually before reinstalling.
diff --git a/stock_eggs/README.md b/stock_eggs/README.md
index 5dd6e42b..9800efe2 100644
--- a/stock_eggs/README.md
+++ b/stock_eggs/README.md
@@ -1,5 +1,5 @@
-# Stock pterodactyl eggs
+# Stock Pterodactyl eggs
 
-eggs based on the stock [pterodactyl eggs](https://github.com/pterodactyl/panel/tree/develop/database/seeds/eggs)
+Eggs based on the stock [Pterodactyl eggs](https://github.com/pterodactyl/panel/tree/develop/database/Seeders/eggs).
 
-These are mostly fixes that should make it into the main repo eventually as I pr them over.
\ No newline at end of file
+These are mostly fixes that should make it into the main repo eventually as I pr them over.
diff --git a/stock_eggs/minecraft/README.md b/stock_eggs/minecraft/README.md
index 89d19035..f4a61dec 100644
--- a/stock_eggs/minecraft/README.md
+++ b/stock_eggs/minecraft/README.md
@@ -1,6 +1,11 @@
 # Minecraft
 
-All the default minecraft things 
+All the default minecraft things
 
 ## Server Ports
-The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
\ No newline at end of file
+
+The minecraft server requires a single port for access (default 25565) but plugins may require extra ports to enabled for the server.
+
+| Port | Default |
+|------|---------|
+| Game | 25565   |
diff --git a/stock_eggs/minecraft/egg-bungeecord.json b/stock_eggs/minecraft/egg-bungeecord.json
index e53ed759..370b3ec4 100644
--- a/stock_eggs/minecraft/egg-bungeecord.json
+++ b/stock_eggs/minecraft/egg-bungeecord.json
@@ -3,14 +3,16 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-10-19T23:22:26+00:00",
+    "exported_at": "2021-11-29T23:22:26+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.",
     "image": "quay.io\/pterodactyl\/core:java",
     "images": [
-        "quay.io\/pterodactyl\/core:java",
-        "quay.io\/pterodactyl\/core:java-11"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
     "config": {
diff --git a/stock_eggs/minecraft/egg-paper.json b/stock_eggs/minecraft/egg-paper.json
index 7278a7f5..7c310fbc 100644
--- a/stock_eggs/minecraft/egg-paper.json
+++ b/stock_eggs/minecraft/egg-paper.json
@@ -3,14 +3,16 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-10-19T23:26:07+00:00",
+    "exported_at": "2021-11-29T23:26:07+00:00",
     "name": "Paper",
     "author": "parker@pterodactyl.io",
     "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.",
     "image": "quay.io\/pterodactyl\/core:java-11",
     "images": [
-        "quay.io\/pterodactyl\/core:java",
-        "quay.io\/pterodactyl\/core:java-11"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
     "config": {
@@ -64,4 +66,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/stock_eggs/minecraft/egg-vanilla-minecraft.json b/stock_eggs/minecraft/egg-vanilla-minecraft.json
index df90f74a..61643ad3 100644
--- a/stock_eggs/minecraft/egg-vanilla-minecraft.json
+++ b/stock_eggs/minecraft/egg-vanilla-minecraft.json
@@ -3,14 +3,16 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2020-10-23T23:04:17+00:00",
+    "exported_at": "2021-11-29T23:04:17+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.",
     "image": "quay.io\/pterodactyl\/core:java",
     "images": [
-        "quay.io\/pterodactyl\/core:java",
-        "quay.io\/pterodactyl\/core:java-11"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
     "config": {
@@ -46,4 +48,4 @@
             "rules": "required|string|between:3,15"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/stock_eggs/rust/README.md b/stock_eggs/rust/README.md
index 22d0e83b..57ad10ea 100644
--- a/stock_eggs/rust/README.md
+++ b/stock_eggs/rust/README.md
@@ -1,15 +1,18 @@
-### Rust
+# Rust
+
 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.
 
-### Minimum RAM warning
+## Minimum RAM warning
+
 The server requires at least 4096MB to run properly.
 This is mostly needed for the startup only, once it is running (depending on your world size) it should consume less.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server.
 
-| Port    | default |
-|---------|---------|
+| Port           | default   |
+|----------------|-----------|
 | Game and Query | 28015 UDP |
-| RCON | 28016 TCP |
-| Rust+ App | 28082 TCP |
+| RCON           | 28016 TCP |
+| Rust+ App      | 28082 TCP |
diff --git a/stock_eggs/source-engine/README.md b/stock_eggs/source-engine/README.md
index 17586b96..40bc2803 100644
--- a/stock_eggs/source-engine/README.md
+++ b/stock_eggs/source-engine/README.md
@@ -4,13 +4,15 @@ The Source Dedicated Server or SRCDS is a tool that runs the server component of
 
 This also covers games that are installed using the steamcmd utility.
 
-### Server Ports
+## Server Ports
+
 Many of these servers will require the steam query ports to be open for the server.
 The default steam query port is 27015
 
 ## ARK Survival Evolved
 
 ### Port Requirements
+
 The ARK server requires 4 ports minimum.
 
 | Port    | default |
@@ -24,9 +26,10 @@ Please note the server may not show up on steam game server lists due to this re
 
 ## Counter Strike: Global Offensive
 
-Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gameplay that it pioneered when it was launched 19 years ago. CS: GO features new maps, characters, weapons, and game modes, and delivers updated versions of the classic CS content (de_dust2, etc.). 
+Counter-Strike: Global Offensive (CS: GO) expands upon the team-based action gameplay that it pioneered when it was launched 19 years ago. CS: GO features new maps, characters, weapons, and game modes, and delivers updated versions of the classic CS content (de_dust2, etc.).
 
 ### Port Requirements
+
 |   Port   | default |
 |----------|---------|
 |   Game   | 27015   |
@@ -38,24 +41,27 @@ This is a generic one size fit's all egg that supports srcds game servers.
 This is not for games like Counter Strike 1.6 which is an HLDS title. See [HLDS server](game_eggs/steamcmd_servers/hlds_server)
 
 ### Port Requirements
+
 |   Port   | default |
 |----------|---------|
 |   Game   | 27015   |
 
 ## Garry's Mod
 
-Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play. 
+Garry's Mod is a physics sandbox. There aren't any predefined aims or goals. We give you the tools and leave you to play.
 
 ### Port Requirements
+
 |   Port   | default |
 |----------|---------|
 |   Game   | 27015   |
 
 ## Insurgency
 
-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. 
+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.
 
 ### Port Requirements
+
 |   Port   | default |
 |----------|---------|
 |   Game   | 27015   |
@@ -65,6 +71,7 @@ Take to the streets for intense close quarters combat, where a team's survival d
 Nine distinct classes provide a broad range of tactical abilities and personalities. Constantly updated with new game modes, maps, equipment and, most importantly, hats!
 
 ### Port Requirements
+
 |   Port   | default |
 |----------|---------|
 |   Game   | 27015   |
diff --git a/stock_eggs/source-engine/egg-garrys-mod.json b/stock_eggs/source-engine/egg-garrys-mod.json
index 056a51bd..8ff1c43c 100644
--- a/stock_eggs/source-engine/egg-garrys-mod.json
+++ b/stock_eggs/source-engine/egg-garrys-mod.json
@@ -4,7 +4,7 @@
         "version": "PTDL_v1",
         "update_url": null
     },
-    "exported_at": "2021-08-27T00:12:31-04:00",
+    "exported_at": "2021-09-13T01:38:39+02: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.",
@@ -22,7 +22,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# 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} -beta ${SRCDS_BETAID} 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"
         }
@@ -99,6 +99,23 @@
             "user_viewable": true,
             "user_editable": true,
             "rules": "required|boolean"
-        }
-    ]
-}
\ No newline at end of file
+        },
+        {
+            "name": "Beta",
+            "description": "Determines which server version should be used. | NONE = stable release | x86-64 = 64Bit beta.",
+            "env_variable": "SRCDS_BETAID",
+            "default_value": "NONE",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|string|max:10"
+        },
+        {
+            "name": "Validate Serverfiles",
+            "description": "Should be enabled once after changing the server version.\r\n0 = disable validating serverfiles,\r\n1 = enable validating serverfiles",
+            "env_variable": "VALIDATE",
+            "default_value": "0",
+            "user_viewable": true,
+            "user_editable": true,
+            "rules": "required|boolean"
+        }    ]
+}
diff --git a/stock_eggs/voice-servers/README.md b/stock_eggs/voice-servers/README.md
index 40aed5be..665395ea 100644
--- a/stock_eggs/voice-servers/README.md
+++ b/stock_eggs/voice-servers/README.md
@@ -4,7 +4,8 @@
 
 Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
 
-## Required Server Ports
+### Required Server Ports
+
 Mumble only requires a single port to run. The default is 64738
 
 | Port    | default |
@@ -15,7 +16,8 @@ Mumble only requires a single port to run. The default is 64738
 
 Use crystal clear sound to communicate with your team mates cross-platform with military-grade security, lag-free performance & unparalleled reliability and uptime.
 
-## Required Server Ports
+### Required Server Ports
+
 Teamspeak 3 only requires a single port to run. The default is 9987
 
 Other ports for ServerQuery and File Transfers are required for specific things.
@@ -26,4 +28,4 @@ Other ports for ServerQuery and File Transfers are required for specific things.
 | Query   | 10011   |
 | Files   | 30033   |
 
-By default pteordactyl sets the query port to the same as the server port.
\ No newline at end of file
+By default pteordactyl sets the query port to the same as the server port.
diff --git a/stock_eggs/voice-servers/egg-teamspeak3-server.json b/stock_eggs/voice-servers/egg-teamspeak3-server.json
index cb88e0e3..6dfb4184 100644
--- a/stock_eggs/voice-servers/egg-teamspeak3-server.json
+++ b/stock_eggs/voice-servers/egg-teamspeak3-server.json
@@ -7,7 +7,7 @@
     "exported_at": "2021-04-27T20:49:27+01:00",
     "name": "Teamspeak3 Server",
     "author": "support@pterodactyl.io",
-    "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.",
+    "description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalability up to thousands of simultaneous users.",
     "features": null,
     "images": [
         "quay.io\/parkervcp\/pterodactyl-images:base_debian"
diff --git a/storage/minio/README.md b/storage/minio/README.md
index 73fcc597..3d5998e6 100644
--- a/storage/minio/README.md
+++ b/storage/minio/README.md
@@ -1,24 +1,25 @@
 # minio s3
 
 ## Features
+
 Auto generate keys on server creation bypassing default minio keys
 
 ## Update
+
 Auto update minio to latest version using "update" startup feature
 
 Automatic Key rotation using "rotate" startup feature
 
 ## Auto Rotate
+
 It's possible to rotate your keys by changing the startup option to "rotate"
 
-
 Once this is changed restart your server and it will automatically move your current keys to old and create your new keys
 
-
 Be sure to change your startup back to "normal" once you have started your server using "rotate". This will ensure that you don't accidentally rotate your keys twice
 
 ## Known Issues
 
 Double encryption may occur if you manually manipulate files in the keys directory
 
-#### Key rotation is handled automatically, DO NOT manually delete files in keys directory
+### Key rotation is handled automatically, DO NOT manually delete files in keys directory
diff --git a/voice_servers/lavalink/README.md b/voice_servers/lavalink/README.md
index ad8b7549..68308238 100644
--- a/voice_servers/lavalink/README.md
+++ b/voice_servers/lavalink/README.md
@@ -1,12 +1,15 @@
 # Lavalink Server
-### From their [Github](https://github.com/freyacodes/Lavalink)
+
+## From their [Github](https://github.com/freyacodes/Lavalink)
+
 Standalone audio sending node based on Lavaplayer and JDA-Audio. Allows for sending audio without it ever reaching any of your shards.
 
-### Server Ports
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port     | default  |
 |----------|----------|
 | Lavalink |  2333    |
 
-#### Mods/Plugins may require ports to be added to the server.
+### Mods/Plugins may require ports to be added to the server
diff --git a/voice_servers/teaspeak/README.md b/voice_servers/teaspeak/README.md
index b3a8ee56..010b4142 100644
--- a/voice_servers/teaspeak/README.md
+++ b/voice_servers/teaspeak/README.md
@@ -1,12 +1,15 @@
 # TeaSpeak
-### From their [Website](https://teaspeak.de/)
-Because a license fee is not my cup of tea!  
 
-### Server Ports
+## From their [Website](https://teaspeak.de/)
+
+Because a license fee is not my cup of tea!
+
+## Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |
 |---------|---------|
 | Voice   | 9987    |
 | Query   | 10101   |
-| File    | 30303   |
\ No newline at end of file
+| File    | 30303   |
diff --git a/voice_servers/teaspeak/egg-tea-speak.json b/voice_servers/teaspeak/egg-tea-speak.json
index af92f78e..42c68e56 100644
--- a/voice_servers/teaspeak/egg-tea-speak.json
+++ b/voice_servers/teaspeak/egg-tea-speak.json
@@ -1,24 +1,28 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-13T16:59:05+01:00",
+    "exported_at": "2021-10-13T23:25:12+00:00",
     "name": "TeaSpeak",
     "author": "parker@parkervcp.com",
     "description": "TeaSpeak is a free to use client and server software for VoIP communication.\r\n\r\nIts the ideal deal software for everyone who is annoyed about limits and restrictions.",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:voice_teaspeak"
+    ],
+    "file_denylist": [],
     "startup": ".\/TeaSpeakServer --property:binding.query.port={{QUERY_PORT}} --property:binding.file.port={{FILE_PORT}} --property:voice.default_port={{SERVER_PORT}}",
     "config": {
-        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"voice.default_port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n            \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n            \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\"\r\n        }\r\n    }\r\n}",
-        "startup": "{\r\n    \"done\": \"Started server on \"\r\n}",
+        "files": "{\r\n    \"config.yml\": {\r\n        \"parser\": \"yaml\",\r\n        \"find\": {\r\n            \"voice.default_port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.env.QUERY_PORT}}\",\r\n            \"file.port\": \"{{server.build.env.FILE_PORT}}\",\r\n            \"query.motd\": \"\\\"{{server.build.env.SERVER_MOTD}}\\\"\",\r\n            \"query.max_line_buffer\": \"10000\"\r\n        }\r\n    }\r\n}",
+        "startup": "{\r\n    \"done\": \"Loaded \"\r\n}",
         "logs": "{}",
         "stop": "shutdown now"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"nightly\" ]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"",
+            "script": "#!\/bin\/bash\r\n \r\n## install required packages\r\napt update\r\napt upgrade -y\r\napt install curl -y\r\n\r\n## make and change to directory\r\nmkdir \/mnt\/server\r\ncd \/mnt\/server\/\r\n\r\n## get download link\r\nif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"latest\" ]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/latest).tar.gz\")\r\nelif [ \"${VERSION}\" == \"\" ] || [ \"${VERSION}\" == \"beta\" ]; then\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/TeaSpeak-$(curl -sSLk https:\/\/repo.teaspeak.de\/server\/linux\/amd64_nightly\/latest).tar.gz\")\r\nelse\r\n    DOWNLOAD_URL=$(echo \"https:\/\/repo.teaspeak.de\/server\/linux\/amd64\/TeaSpeak-${VERSION}.tar.gz\")\r\nfi\r\n\r\nif [ ! -z \"${DOWNLOAD_URL}\" ]; then \r\n    if curl --output \/dev\/null --silent --head --fail ${DOWNLOAD_URL}; then\r\n        echo -e \"link is valid. setting download link to ${DOWNLOAD_URL}\"\r\n        DOWNLOAD_LINK=${DOWNLOAD_URL}\r\n    else        \r\n        echo -e \"link is invalid closing out\"\r\n        exit 2\r\n    fi\r\nfi\r\n\r\n## download files\r\necho -e \"running: curl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\"\r\ncurl -sSL -o teaspeak.tar.gz ${DOWNLOAD_LINK}\r\n\r\n## unpack files\r\necho -e \"unpacking files\"\r\ntar xzvf teaspeak.tar.gz\r\n\r\necho -e \"install complete\"",
             "container": "debian:buster-slim",
             "entrypoint": "bash"
         }
@@ -60,18 +64,9 @@
             "user_editable": false,
             "rules": "required|string"
         },
-        {
-            "name": "ld preload",
-            "description": "Don't touch this if you want the server to start",
-            "env_variable": "LD_PRELOAD",
-            "default_value": ".\/libs\/libjemalloc.so.2",
-            "user_viewable": false,
-            "user_editable": false,
-            "rules": "required|string"
-        },
         {
             "name": "Teaspeak Version",
-            "description": "What version of teaspeak to install: latest = latest stable ; nightly = latest nightly",
+            "description": "What version of teaspeak to install: latest = latest stable ; beta = latest beta",
             "env_variable": "VERSION",
             "default_value": "latest",
             "user_viewable": true,
diff --git a/voice_servers/ts3_manager/README.md b/voice_servers/ts3_manager/README.md
index 8d64dd67..731d290f 100644
--- a/voice_servers/ts3_manager/README.md
+++ b/voice_servers/ts3_manager/README.md
@@ -1,5 +1,6 @@
 # TS3 Manager
-### [Website](https://www.ts3.app/)
+
+## [Website](https://www.ts3.app/)
 
 TS3 Manager is a simple and lightwight webbased Teamspeak Webinterface
 
@@ -8,6 +9,7 @@ TS3 Manager is a simple and lightwight webbased Teamspeak Webinterface
 Connect with your IP from your Pteroserver and the assigned Port. Add your IP to TS Server Withlist
 
 ### Server Ports
+
 Ports required to run the server in a table format.
 
 | Port    | default |