diff --git a/README.md b/README.md
index 0841502c..82b31b09 100644
--- a/README.md
+++ b/README.md
@@ -29,10 +29,12 @@ If you submit a PR without filling out the template I will deny it. This is for
 ## Bot Eggs
 
 [Discord](/bots/discord/)   
-* [ATL Bot](/bots/discord/atlbot) Node JS  
+* [ATL Bot](/bots/discord/atlbot/) Node JS  
 * [parkertron](/bots/discord/parkertron/) Golang  
 * [pixel-bot](/bots/discord/pixelbot/) Python  
+* [discord.js](bots/discord/discord.js/)
 * [Sinusbot](/bots/discord/sinusbot/)  
+* [Bastion](/bots/discord/bastion/)
 
 ## Game Eggs
 
diff --git a/arma/arma3/egg-arma3-config/basic.cfg b/arma/arma3/egg-arma3-config/basic.cfg
new file mode 100644
index 00000000..7b5a1c99
--- /dev/null
+++ b/arma/arma3/egg-arma3-config/basic.cfg
@@ -0,0 +1,83 @@
+// ****************************************************************************
+//                                                                            *
+//     Arma 3 - basic.cfg                                                   *
+//     Version 060116                                                         *
+//                                                                            *
+// ****************************************************************************
+
+// Defines network tuning parameters
+//
+// This file is to be passed to the -cfg parameter on the command line for the server
+// See http://community.bistudio.com/wiki/basic.cfg
+// The following settings are the suggested settings
+
+// BANDWIDTH SETTINGS
+
+// Bandwidth the server is guaranteed to have (in bps)
+// General guideline is NumberOfPlayers * 256kb
+// Default: 131072
+MinBandwidth=5120000;
+// Bandwidth the server can never go above (in bps)
+// For a single server, use full network speed; decrease when running multiple servers
+MaxBandwidth=10240000;
+
+// PACKET SETTINGS
+
+// Maximum number of packets per frame.
+// Increasing the value potentially decreases lag, but increases desync
+// Default: 128
+MaxMsgSend=2048;
+// Maximum payload of guaranteed packet (in b)
+// Small messages are packed to larger packets
+// Guaranteed packets are used for non-repetitive events, like shooting
+// Lower value means more packets are sent, so less events will get combined
+// Default: 512
+MaxSizeGuaranteed=512;
+// Maximum payload of non-guaranteed packet (in b)
+// Increasing this value may improve bandwidth requirement, but may also increase lag
+// Largest factor in desync
+// Guidance is half of MaxSizeGuaranteed
+// Default: 256
+MaxSizeNonguaranteed=256;
+// Maximal size of a packet sent over the network
+// Only necessary if ISP forces lower packet size and there are connectivity issues
+// Default: 1400
+// class sockets{maxPacketSize=1400};
+
+// SMOOTHNESS SETTINGS
+
+// Minimal error required to send network updates for far units
+// Smaller values will make for smoother movement at long ranges, but will increase network traffic
+// Default: 0.003
+MinErrorToSend=0.01;
+// Minimal error required to send network updates for near units
+// Using larger value can reduce traffic sent for near units
+// Also controls client to server traffic
+// Default: 0.01
+MinErrorToSendNear=0.02;
+
+// GEOLOCATION SETTINGS
+
+// Server latitude
+serverLatitude=52;
+serverLatitudeAuto=52;
+
+// Server Longitude
+serverLongitude=0;
+serverLongitudeAuto=0;
+// MISC
+// View Distance (not sure if this actually works)
+viewDistance=10000;
+
+// Maximum size (in b) for custom face or sound files
+// Default: 0
+MaxCustomFileSize=65536;
+// Server language
+language="English";
+steamLanguage="English";
+// Adapter
+adapter=-1;
+// Windowed mode
+Windowed=0;
+
+3D_Performance=1.000000;
\ No newline at end of file
diff --git a/arma/arma3/egg-arma3-config/server.cfg b/arma/arma3/egg-arma3-config/server.cfg
new file mode 100644
index 00000000..ee73e428
--- /dev/null
+++ b/arma/arma3/egg-arma3-config/server.cfg
@@ -0,0 +1,130 @@
+// ****************************************************************************
+//                                                                            *
+//     Arma 3 - server.cfg                                                    *
+//     Version 060117                                                         *
+//                                                                            *
+// ****************************************************************************
+
+// ArmA 3 Server Config File
+//
+// More info about parameters:
+// https://community.bistudio.com/wiki/server.cfg
+
+
+// GENERAL SETTINGS
+
+// Hostname for server.
+hostname = "Arma 3 Server"
+
+// Server password - for private servers.
+//password = "arma3pass";
+
+// Admin Password
+//passwordAdmin = "ADMINPASSWORD";
+
+// Auto-admin
+admins[] = {"<UID>"};
+
+// Server Slots
+maxPlayers = 32;
+
+// Logfile
+logFile = "arma3server.log";
+
+// Minimum Required Client Build
+//requiredBuild = 95691
+
+// Message of the Day (MOTD)
+motd[] = {
+    "Welcome to My Arma 3 Server",
+    "TS3 Server:     teamspeak.somewhere.com",
+    "Web:            www.example.com"
+};
+
+// MOTD Interval (Seconds)
+motdInterval = 30;
+
+
+// VOTING
+
+// Server Mission Start
+//  minimum number of clients before server starts mission
+voteMissionPlayers = 1;
+
+// Accepted Vote Threshold
+//  0.33 = 33% clients.
+voteThreshold = 0.33;
+
+// INGAME SETTINGS
+
+// Disable Voice over Net (VoN)
+//  0 = voice enabled.
+//  1 = voice disabled.
+disableVoN = 0;
+
+// VoN Codec Quality
+//  0-10 = 8kHz (narrowband).
+//  11-20 = 16kHz (wideband).
+//  21-30 = 32kHz (ultrawideband).
+vonCodecQuality = 3;
+
+// Persistent Battlefield
+//  0 = disable.
+//  1 = enable.
+persistent = 1;
+
+// Time Stamp Format
+//  none, short, full
+timeStampFormat = "short";
+
+// Server Statistics
+//  Set this to 0 to opt-out! More info: https://community.bistudio.com/wiki/Arma_3_Analytics
+statisticsEnabled = 1;
+
+// SERVER SECURITY/ANTI HACK
+
+// Verify Signitures for Client Addons
+//  0 = off.
+//  1 = weak protection (depricated).
+//  2 = full protection.
+verifySignatures = 2;
+
+// Secure Player ID
+//  1 = Server warning message.
+//  2 = Kick client.
+requiredSecureId = 2;
+
+// Kick Duplicate Player IDs
+kickDuplicate = 1;
+
+// BattlEye Anti-Cheat
+//  0 = disable
+//  1 = enable
+BattlEye = 1;
+
+// Allowed File Extentions
+allowedLoadFileExtensions[] = {"hpp","sqs","sqf","fsm","cpp","paa","txt","xml","inc","ext","sqm","ods","fxy","lip","csv","kb","bik","bikb","html","htm","biedi"};
+allowedPreprocessFileExtensions[] = {"hpp","sqs","sqf","fsm","cpp","paa","txt","xml","inc","ext","sqm","ods","fxy","lip","csv","kb","bik","bikb","html","htm","biedi"};
+allowedHTMLLoadExtensions[] = {"htm","html","xml","txt"};
+
+// SCRIPTING ISSUES
+onUserConnected = "";
+onUserDisconnected = "";
+doubleIdDetected = "";
+
+// SIGNATURE VERIFICATION
+// kick = kick (_this select 0)
+// ban = ban (_this select 0)
+onUnsignedData = "kick (_this select 0)";
+onHackedData = "kick (_this select 0)";
+onDifferentData = "";
+
+// HEADLESS CLIENT SUPPORT
+// specify ip-adresses of allowed headless clients
+headlessClients[] = {"127.0.0.1", "172.18.0.1"};
+localClient[] = {"127.0.0.1", "172.18.0.1"};
+
+// BattlEye Anti-Cheat License
+//  0 = decline
+//  1 = accept
+battleyeLicense = 1;
\ No newline at end of file
diff --git a/arma/arma3/egg-arma3.json b/arma/arma3/egg-arma3.json
index 0eec1209..6cafce19 100644
--- a/arma/arma3/egg-arma3.json
+++ b/arma/arma3/egg-arma3.json
@@ -8,7 +8,7 @@
     "author": "daave@aaathats3as.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.",
     "image": "quay.io\/parkervcp\/pterodactyl-images:game_arma3",
-    "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{CFG}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"",
+    "startup": ".\/arma3server -ip=0.0.0.0 -port={{SERVER_PORT}} -cfg={{BASIC}} -config={{CONFIG}} {{CUSTOM}} -mod=\"{{MODS}}\" -serverMod=\"{{SERVERMODS}}\"",
     "config": {
         "files": "{}",
         "startup": "{\r\n    \"done\": \"Connected to Steam servers\",\r\n    \"userInteraction\": []\r\n}",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit",
+            "script": "#!\/bin\/bash\r\n\r\napt -y update\r\napt -y --no-install-recommends install curl\r\napt -y --no-install-recommends install lib32gcc1 ca-certificates\r\n\r\ncd \/tmp\r\ncurl -sSLO http:\/\/media.steampowered.com\/installer\/steamcmd_linux.tar.gz\r\n\r\nmkdir -p \/mnt\/server\/steamcmd \/mnt\/server\/logs\r\nmkdir -p \"\/mnt\/server\/.local\/share\/Arma 3\" \"\/mnt\/server\/.local\/share\/Arma 3 - Other Profiles\"\r\n\r\ntouch \/mnt\/server\/latest.log\r\nchown -R root:root \/mnt\r\n\r\ntar -xzvf \/tmp\/steamcmd_linux.tar.gz -C \/mnt\/server\/steamcmd\r\ncd \/mnt\/server\/steamcmd\r\nexport HOME=\/mnt\/server\r\n\r\n.\/steamcmd.sh +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} +force_install_dir \/mnt\/server +app_update ${APP_ID} validate +quit\r\n\r\ncd \/mnt\/server\/\r\n[[ -f basic.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/basic.cfg\r\n[[ -f server.cfg ]] || curl -sSLO https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/arma\/arma3\/egg-arma3-config\/server.cfg",
             "container": "ubuntu:18.04",
             "entrypoint": "bash"
         }
@@ -33,19 +33,19 @@
             "rules": "required|alpha_dash|between:1,100"
         },
         {
-            "name": "Config CFG",
-            "description": "Config CFG",
-            "env_variable": "CFG",
-            "default_value": "cfg.cfg",
+            "name": "Basic",
+            "description": "Basic network config",
+            "env_variable": "BASIC",
+            "default_value": "basic.cfg",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "string|nullable"
         },
         {
             "name": "Config",
-            "description": "Config",
+            "description": "Server config",
             "env_variable": "CONFIG",
-            "default_value": "config.cfg",
+            "default_value": "server.cfg",
             "user_viewable": 1,
             "user_editable": 1,
             "rules": "string|nullable"
@@ -105,4 +105,4 @@
             "rules": "nullable|string"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/bots/discord/README.md b/bots/discord/README.md
index 06cfbb6e..8615f33f 100644
--- a/bots/discord/README.md
+++ b/bots/discord/README.md
@@ -2,6 +2,10 @@
 
 ### Some of these bots support other services but are primarily Discord bots
 
+#### Generic Discord.js bot egg
+discord.js  
+A generic discord.js bot egg. Meant to pull from a repo can also be used where a user can upload the files on their own.
+
 #### ATLauncher Discord Bot
 [ATLauncher/discord-bot](https://github.com/ATLauncher/discord-bot)  
 Their github has all the info you need  
diff --git a/bots/discord/atlbot/README.md b/bots/discord/atlbot/README.md
new file mode 100644
index 00000000..008d3906
--- /dev/null
+++ b/bots/discord/atlbot/README.md
@@ -0,0 +1,6 @@
+# ATLBot
+### 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
diff --git a/bots/discord/atlbot/bot/egg-a-t-l-bot.json b/bots/discord/atlbot/egg-a-t-l-bot.json
similarity index 100%
rename from bots/discord/atlbot/bot/egg-a-t-l-bot.json
rename to bots/discord/atlbot/egg-a-t-l-bot.json
diff --git a/bots/discord/bastion/README.md b/bots/discord/bastion/README.md
new file mode 100644
index 00000000..c57d5814
--- /dev/null
+++ b/bots/discord/bastion/README.md
@@ -0,0 +1,9 @@
+# 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.  
+
+### Server Ports
+No Ports are required for the bastion bot.  
\ No newline at end of file
diff --git a/bots/discord/discord.js/README.md b/bots/discord/discord.js/README.md
new file mode 100644
index 00000000..7a241119
--- /dev/null
+++ b/bots/discord/discord.js/README.md
@@ -0,0 +1,5 @@
+# discord.js generic
+
+This egg was designed to allow a user to pull their own nodejs discord bot from a repo.
+
+There is an option to allow a user to upload their own files to run a bot.
\ No newline at end of file
diff --git a/bots/discord/discord.js/egg-discord-js-generic.json b/bots/discord/discord.js/egg-discord-js-generic.json
new file mode 100644
index 00000000..7bd0d3b7
--- /dev/null
+++ b/bots/discord/discord.js/egg-discord-js-generic.json
@@ -0,0 +1,54 @@
+{
+    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
+    "meta": {
+        "version": "PTDL_v1"
+    },
+    "exported_at": "2019-04-01T15:16:34-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.",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:bot_discordjs",
+    "startup": "\/usr\/local\/bin\/node \/home\/container\/index.js",
+    "config": {
+        "files": "{}",
+        "startup": "{}",
+        "logs": "{}",
+        "stop": "^c"
+    },
+    "scripts": {
+        "installation": {
+            "script": "#\/bin\/ash\r\n\r\napk add --no-cache git\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"working on installing a discord.js bot from ${INSTALL_REPO}\"\r\n\r\nif [ \"${USER_UPLOAD}\" == \"true\" ] || [ \"${USER_UPLOAD}\" == \"1\" ]; then\r\n\techo -e \"assuming user knows what they are doing have a good day.\"\r\n\texit 0\r\nelse\r\n\tif [ \"$(ls -A \/mnt\/server)\" ]; then\r\n\t\techo -e \"\/mnt\/server directory is not empty.\"\r\n\t     if [ -d .git ]; then\r\n\t\t\techo -e \".git directory exists\" \r\n\t\t\tif [ -f .git\/config ]; then\r\n\t\t\t\techo -e \"loading info from git config\"\r\n\t\t\t\tORIGIN=$(git config --get remote.origin.url)\r\n\t\t\telse\r\n\t\t\t\techo -e \"files found with no git config\"\r\n\t\t\t\techo -e \"closing out without touching things to not break anything\"\r\n\t\t\t\texit 10\r\n\t\t\tfi\r\n\t\tfi\r\n\t\tif [ \"${ORIGIN}\" == \"${INSTALL_REPO}\" ]; then\r\n\t\t\techo \"pulling latest from github\"\r\n\t\t\tgit pull \r\n\t\t\techo -e \"updating local npm modules\"\r\n\t\t\t\/usr\/local\/bin\/npm install --production\r\n\t\tfi\r\n\telse\r\n    \techo -e \"\/mnt\/server is empty.\\ncloning files into repo\"\r\n\t\tif [ -z ${INSTALL_BRANCH} ]; then\r\n\t\t\techo -e \"assuming master branch\"\r\n\t\t\tINSTALL_BRANCH=master\r\n\t\tfi\r\n        \r\n\t\techo -e \"running 'git clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .'\"\r\n\t\tgit clone --single-branch --branch ${INSTALL_BRANCH} ${INSTALL_REPO} .\r\n\t\techo -e \"install npm modules locally\"\r\n\t\t\/usr\/local\/bin\/npm install --production\r\n\tfi\r\nfi \r\n\r\necho -e \"install complete\"\r\nexit 0",
+            "container": "node:10-alpine",
+            "entrypoint": "ash"
+        }
+    },
+    "variables": [
+        {
+            "name": "Install Repo",
+            "description": "The git repo to clone and install the discord js bot from",
+            "env_variable": "INSTALL_REPO",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "nullable|string|max:128"
+        },
+        {
+            "name": "Install Branch",
+            "description": "The branch of the bot to install",
+            "env_variable": "INSTALL_BRANCH",
+            "default_value": "",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "nullable|string|max:32"
+        },
+        {
+            "name": "User Uploaded Files",
+            "description": "Skip all the install cruft is you are just letting a user upload files.\r\n\r\n0 = false (default)\r\n1 = true",
+            "env_variable": "USER_UPLOAD",
+            "default_value": "0",
+            "user_viewable": 1,
+            "user_editable": 0,
+            "rules": "required|bool"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/bots/discord/parkertron/README.md b/bots/discord/parkertron/README.md
new file mode 100644
index 00000000..99f14234
--- /dev/null
+++ b/bots/discord/parkertron/README.md
@@ -0,0 +1,8 @@
+# ATLBot
+### 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
diff --git a/bots/discord/pixelbot/README.md b/bots/discord/pixelbot/README.md
new file mode 100644
index 00000000..4726344e
--- /dev/null
+++ b/bots/discord/pixelbot/README.md
@@ -0,0 +1,9 @@
+# pixelbot
+### 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
diff --git a/bots/discord/sinusbot/README.md b/bots/discord/sinusbot/README.md
new file mode 100644
index 00000000..9fe05294
--- /dev/null
+++ b/bots/discord/sinusbot/README.md
@@ -0,0 +1,15 @@
+# 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!  
+
+### 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
diff --git a/minecraft_java/README.md b/minecraft_java/README.md
index 07a09740..0302be2e 100644
--- a/minecraft_java/README.md
+++ b/minecraft_java/README.md
@@ -7,19 +7,6 @@ It’s set in infinitely-generated worlds of wide open terrain - icy mountains,
 ## 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
-A collection of spigot and forked spigot eggs.
-
-[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)
-
-[PaperMC GitHub](https://github.com/PaperMC/Paper)  
-High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies  
-
-[Taco Spigot GitHub](https://github.com/TacoSpigot/TacoSpigot)  
-An even-higher higher performance PaperSpigot fork that adds new features.  
-
 ## Forge 
 [Forge MC](https://files.minecraftforge.net/)  
 This is a direct fork of the default forge service  
@@ -38,6 +25,19 @@ Supply values to 2 variables to use
 [FTB Revelation](https://www.feed-the-beast.com/projects/ftb-revelation)  
 Revelation is a general all-purpose modpack with optimal FPS, server performance and stability.  
 
+## Paper
+Currently the default on pterodactyl for many reasons. First being that you don't need to build the jar.
+
+## Spigot
+A collection of spigot and forked spigot eggs.
+
+[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)
+
+[PaperMC GitHub](https://github.com/PaperMC/Paper)  
+High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies  
+
 #### 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!  
diff --git a/minecraft_java/forge/forge-generic/egg-forge-generic.json b/minecraft_java/forge/forge-generic/egg-forge-generic.json
index 3715dbae..d09c03a4 100644
--- a/minecraft_java/forge/forge-generic/egg-forge-generic.json
+++ b/minecraft_java/forge/forge-generic/egg-forge-generic.json
@@ -10,7 +10,7 @@
     "image": "quay.io\/pterodactyl\/core:java",
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"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}",
         "stop": "stop"
diff --git a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json
index e84cdd79..675a1f2d 100644
--- a/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json
+++ b/minecraft_java/ftb/feed-the-beast/egg-feed-the-beast.json
@@ -3,21 +3,21 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-04-02T17:20:55-04:00",
+    "exported_at": "2019-04-03T08:08:25-04:00",
     "name": "Feed the Beast",
     "author": "aevum@decess.us",
     "description": "Egg to handle all official FTB Modpacks",
-    "image": "quay.io\/pterodactyl\/core:java",
-    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserver-*.jar",
+    "image": "quay.io\/pterodactyl\/core:java-glibc",
+    "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserv*.jar",
     "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            \"level-name\": \"{{server.build.env.LEVEL_NAME}}\",\r\n            \"level-seed\": \"{{server.build.env.LEVEL_SEED}}\",\r\n            \"max-players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"motd\": \"{{server.build.env.MOTD}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\",\r\n            \"level-name\": \"{{server.build.env.LEVEL_NAME}}\",\r\n            \"level-seed\": \"{{server.build.env.LEVEL_SEED}}\",\r\n            \"max-players\": \"{{server.build.env.MAX_PLAYERS}}\",\r\n            \"motd\": \"{{server.build.env.MOTD}}\"\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}",
         "stop": "stop"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n    ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' |  cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n    echo \"ID: ${ID}\"\r\nelse \r\n    ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n    echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\n\r\nsh .\/FTBInstall.sh",
+            "script": "#!\/bin\/ash\r\n# Generic FTB Server Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n# MODPACK_VERSION = version of the modpack, set in variables\r\n# i.e MODPACK_VERSION=1.5.0\r\n# MODPACK_URL = url base of the pack, set in variables, hardcoded\r\n# i.e https:\/\/www.feed-the-beast.com\/projects\/ftb-revelation\/files\r\n# MODPACK_URL=ftb-revelation\r\n\r\napk add curl --no-cache\r\n\r\n## Correcting for bad variables\r\nGETPACK=$(echo ${MODPACK_URL} | cut -d \"\/\" -f 5 )\r\necho -e \"\\n The pack being downloaded is $GETPACK \\n\"\r\n\r\n## Getting the Base URL\r\nBASEURL=https:\/\/www.feed-the-beast.com\/projects\/${GETPACK}\/files\r\necho \"The base URL is ${BASEURL}\"\r\n\r\n## This is meant to get the pack ID that is unique and not exactly clear \r\n\r\n\r\nif [ -z \"${MODPACK_VERSION}\" ] || [ \"${MODPACK_VERSION}\" == \"latest\" ]; then\r\n    ID=`curl -sl ${BASEURL} | grep -i -A9 'title=\"release\"' | grep -i -o 'href=\".*\"' |  cut -d \"\/\" -f5 | sed s\/\\\"\/\/g`\r\n    echo \"ID: ${ID}\"\r\nelse \r\n    ID=`curl -sl ${BASEURL} | grep -i -A9 \"${MODPACK_VERSION}\" | grep -m1 -oE 'href=\"[^\\\"]+\"' | cut -d \"\/\" -f5 | grep -oE [0-9]+`\r\n    echo \"ID: ${ID}\"\r\nfi\r\n\r\nSECONDURL=${BASEURL}\/${ID}\r\necho \"SECONDURL: ${SECONDURL}\"\r\n\r\nGOOD_ID=`curl -sl ${SECONDURL} | grep -i server | grep -Eo 'href=\"[^\\\"]+\"' | grep -o -E \"[0-9]+\" | tail -1`\r\necho \"GOOD_ID: ${GOOD_ID}\"\r\n\r\nDL_URL=${BASEURL}\/${GOOD_ID}\/download\r\necho \"Download_URL: ${DL_URL}\"\r\n\r\ncd \/mnt\/server\r\n\r\necho \"Executing curl -L ${DL_URL} -o $GETPACK.zip\"\r\ncurl -L ${DL_URL} -o $GETPACK.zip\r\n\r\nunzip ${GETPACK}.zip\r\n\r\nrm -rf ${GETPACK}.zip\r\n\r\necho \"Running FTBInstall.sh\"\r\nif [ -f .\/FTBInstall.sh ]; then\r\n    sh .\/FTBInstall.sh\r\nelse\r\n    echo -e \"No FTBInstall script found. Assumeing it's not needed.\"\r\nfi",
             "container": "alpine:3.9",
             "entrypoint": "ash"
         }
@@ -30,7 +30,7 @@
             "default_value": "",
             "user_viewable": 1,
             "user_editable": 1,
-            "rules": "required|regex:([a-z-0-9]+$)"
+            "rules": "nullable|regex:([a-z-0-9]+$)"
         },
         {
             "name": "Modpack Version",
@@ -78,4 +78,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json
index ba408d36..726ce374 100644
--- a/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json
+++ b/minecraft_java/ftb/ftb-revelation/egg-f-t-b-revelation.json
@@ -3,14 +3,14 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-02-26T23:48:51-05:00",
+    "exported_at": "2019-03-15T16:25:38+00:00",
     "name": "FTB Revelation",
     "author": "aevum@decess.us",
     "description": "Revelation is a general all-purpose pack that is designed for solo play as well as small and medium population servers. This pack contains a mix of magic, tech and exploration mods, and is the largest pack ever built and released by the Feed The Beast Team.",
     "image": "quay.io\/pterodactyl\/core:java",
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar FTBserver-*.jar",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"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}",
         "stop": "stop"
diff --git a/minecraft_java/paper/README.MD b/minecraft_java/paper/README.MD
new file mode 100644
index 00000000..87eef00a
--- /dev/null
+++ b/minecraft_java/paper/README.MD
@@ -0,0 +1,11 @@
+# Paper
+
+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.
+
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |
\ No newline at end of file
diff --git a/minecraft_java/paper/egg-paper.json b/minecraft_java/paper/egg-paper.json
index 4e99297c..05a8bfce 100644
--- a/minecraft_java/paper/egg-paper.json
+++ b/minecraft_java/paper/egg-paper.json
@@ -3,21 +3,21 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2019-03-02T20:29:50-05:00",
+    "exported_at": "2019-03-28T15:18:36-04: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",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre",
     "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            \"server-port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"userInteraction\": [\r\n        \"Go to eula.txt for more info.\"\r\n    ]\r\n}",
         "logs": "{}",
         "stop": "stop"
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n    echo -e \"using supplied download url\"\r\n    DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n    VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n    LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r '.versions' | jq -r '.[0]'`\r\n    \r\n    if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n        echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n    else\r\n        echo -e \"Using the latest paper version\"\r\n        MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n    fi\r\n    \r\n    BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true`\r\n    LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n    \r\n    if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n        echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest paper build\"\r\n        BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n    fi\r\n    \r\n    echo \"Version being downloaded\"\r\n    echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/paper\/${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\ncurl -o ${SERVER_JARFILE} ${DOWNLOAD_URL}\r\n\r\necho -e \"Downloading MC server.properties\"\r\ncurl -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties",
+            "script": "#!\/bin\/ash\r\n# Paper Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk add --no-cache --update curl jq\r\n\r\nif [ -n \"${DL_PATH}\" ]; then\r\n    echo -e \"using supplied download url\"\r\n    DOWNLOAD_URL=`eval echo $(echo ${DL_PATH} | sed -e 's\/{{\/${\/g' -e 's\/}}\/}\/g')`\r\nelse\r\n    VER_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r --arg VERSION $MINECRAFT_VERSION '.versions[] | IN($VERSION)' | grep true`\r\n    LATEST_PAPER_VERSION=`curl -s https:\/\/papermc.io\/api\/v1\/paper | jq -r '.versions' | jq -r '.[0]'`\r\n    \r\n    if [ \"${VER_EXISTS}\" == \"true\" ]; then\r\n        echo -e \"Version is valid. Using version ${MINECRAFT_VERSION}\"\r\n    else\r\n        echo -e \"Using the latest paper version\"\r\n        MINECRAFT_VERSION=${LATEST_PAPER_VERSION}\r\n    fi\r\n    \r\n    BUILD_EXISTS=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r --arg BUILD ${BUILD_NUMBER} '.builds.all[] | IN($BUILD)' | grep true`\r\n    LATEST_PAPER_BUILD=`curl -s https:\/\/papermc.io\/api\/v1\/paper\/${MINECRAFT_VERSION} | jq -r '.builds.latest'`\r\n    \r\n    if [ \"${BUILD_EXISTS}\" == \"true\" ] || [ ${BUILD_NUMBER} == \"latest\" ]; then\r\n        echo -e \"Build is valid. Using version ${BUILD_NUMBER}\"\r\n    else\r\n        echo -e \"Using the latest paper build\"\r\n        BUILD_NUMBER=${LATEST_PAPER_BUILD}\r\n    fi\r\n    \r\n    echo \"Version being downloaded\"\r\n    echo -e \"MC Version: ${MINECRAFT_VERSION}\"\r\n    echo -e \"Build: ${BUILD_NUMBER}\"\r\n    DOWNLOAD_URL=https:\/\/papermc.io\/api\/v1\/paper\/${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    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 -o server.properties https:\/\/raw.githubusercontent.com\/parkervcp\/eggs\/master\/minecraft_java\/server.properties\r\nfi",
             "container": "alpine:3.9",
             "entrypoint": "ash"
         }
diff --git a/minecraft_java/spigot/spigot/README.MD b/minecraft_java/spigot/spigot/README.MD
new file mode 100644
index 00000000..92ed0f4f
--- /dev/null
+++ b/minecraft_java/spigot/spigot/README.MD
@@ -0,0 +1,19 @@
+# Spigot
+
+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.
+
+
+| Port  | default |
+|-------|---------|
+| Game  | 25565   |
+
+## Server Specific
+
+Spigot was hit with a DMCA and now requires that it be built by the user.
+
+#### 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
diff --git a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json b/minecraft_java/spigot/spigot/egg-spigot.json
similarity index 75%
rename from minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json
rename to minecraft_java/spigot/spigot/egg-spigot.json
index 2f178d80..c6e06f61 100644
--- a/minecraft_java/spigot/spigot-enhanced/egg-spigot--enhanced.json
+++ b/minecraft_java/spigot/spigot/egg-spigot.json
@@ -3,11 +3,11 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-02-25T12:20:22-05:00",
-    "name": "Spigot-Enhanced",
+    "exported_at": "2019-03-29T13:00:51-04: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.",
-    "image": "quay.io\/pterodactyl\/core:java-glibc",
+    "image": "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-8-jre",
     "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}",
@@ -17,7 +17,7 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\n## Only download if a path is provided, otherwise continue.\r\nif [ ! -z \"${DL_PATH}\" ]; then\r\n    apk update\r\n    apk add curl\r\n\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    apk add --no-cache curl git openjdk8 openssl\r\n    \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    mv BuildTools.jar \/srv\/\r\n\r\n    java -jar BuildTools.jar --rev ${SPIGOT_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
+            "script": "#!\/bin\/ash\r\n# Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\n\r\napk add --no-cache --update curl git openjdk8 openssl bash nss\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    cd \/srv\/\r\n    \r\n    wget https:\/\/hub.spigotmc.org\/jenkins\/job\/BuildTools\/lastSuccessfulBuild\/artifact\/target\/BuildTools.jar\r\n    \r\n    mv BuildTools.jar \/srv\/\r\n\r\n    java -jar BuildTools.jar --rev ${DL_VERSION}\r\n\r\n    mv spigot-*.jar \/mnt\/server\/${SERVER_JARFILE}\r\nfi",
             "container": "alpine:3.9",
             "entrypoint": "ash"
         }
@@ -32,15 +32,6 @@
             "user_editable": 1,
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         },
-        {
-            "name": "Spigot Version",
-            "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.",
-            "env_variable": "SPIGOT_VERSION",
-            "default_value": "latest",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|between:3,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).",
@@ -49,6 +40,15 @@
             "user_viewable": 0,
             "user_editable": 0,
             "rules": "nullable|string"
+        },
+        {
+            "name": "Spigot Version",
+            "description": "The version of Spigot to download (using the --rev tag). Use \"latest\" for latest.",
+            "env_variable": "DL_VERSION",
+            "default_value": "latest",
+            "user_viewable": 1,
+            "user_editable": 1,
+            "rules": "required|string|between:3,7"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json b/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json
deleted file mode 100644
index aff41987..00000000
--- a/minecraft_java/spigot/taco-spigot/egg-taco-spigot.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
-    "meta": {
-        "version": "PTDL_v1"
-    },
-    "exported_at": "2018-03-10T00:34:01-06:00",
-    "name": "Taco Spigot",
-    "author": "hostmaster@waterfallgaming.net",
-    "description": "A even-higher higher performance PaperSpigot fork that adds new features.",
-    "image": "quay.io\/pterodactyl\/core:java-glibc",
-    "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}",
-        "stop": "stop"
-    },
-    "scripts": {
-        "installation": {
-            "script": "#!\/bin\/ash\r\n# Taco Spigot Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\ncd \/mnt\/server\r\n\r\nif [ -z \"${DL_VERSION}\" ] || [ \"${DL_VERSION}\" == \"latest\" ]; then\r\n    DL_VERSION=\"lastSuccessfulBuild\"\r\nfi\r\n\r\ncurl -o ${SERVER_JARFILE} https:\/\/ci.techcable.net\/job\/TacoSpigot\/${DL_VERSION}\/artifact\/build\/TacoSpigot.jar",
-            "container": "alpine:3.9",
-            "entrypoint": "ash"
-        }
-    },
-    "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": 1,
-            "user_editable": 1,
-            "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
-        },
-        {
-            "name": "TacoSpigot Version",
-            "description": "The version of TacoSpigot to download, Use \"latest\" for latest.",
-            "env_variable": "DL_VERSION",
-            "default_value": "latest",
-            "user_viewable": 1,
-            "user_editable": 1,
-            "rules": "required|string|between:3,7"
-        }
-    ]
-}
diff --git a/minecraft_java/technic/blightfall/egg-blightfall.json b/minecraft_java/technic/blightfall/egg-blightfall.json
index 2fd18f10..229728f9 100644
--- a/minecraft_java/technic/blightfall/egg-blightfall.json
+++ b/minecraft_java/technic/blightfall/egg-blightfall.json
@@ -3,14 +3,14 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-02-26T20:41:27-05:00",
+    "exported_at": "2019-03-15T16:25:38+00:00",
     "name": "Blightfall",
     "author": "aevum@decess.us",
     "description": "Blightfall is a combination modpack and adventure map about surviving on an alien planet. It uses magic mods and tech mods to create a novel gameplay experience. Can you survive on a world completely covered by Thaumcraft taint?\r\n\r\nhttps:\/\/www.technicpack.net\/modpack\/blightfall.592618",
     "image": "quay.io\/pterodactyl\/core:java",
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Blightfall.jar",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"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}",
         "stop": "stop"
diff --git a/minecraft_java/technic/hexxit/egg-hexxit.json b/minecraft_java/technic/hexxit/egg-hexxit.json
index 2617acb5..5ca6fed8 100644
--- a/minecraft_java/technic/hexxit/egg-hexxit.json
+++ b/minecraft_java/technic/hexxit/egg-hexxit.json
@@ -3,14 +3,14 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-02-26T20:41:41-05:00",
+    "exported_at": "2019-03-15T16:25:38+00:00",
     "name": "Hexxit",
     "author": "aevum@decess.us",
     "description": "Gear up and set forth on a campaign worthy of legend, for Hexxit has been unearthed! Dark dungeons, towering spires, weathered ruins and musty tomes lay before you. Lay claim to riches or create your own artifacts, tame beasts and carve out your own story in endless wonder. Alone or with friends, adventure awaits in Hexxit.\r\n\r\nHexxit is a new collection of mods for Minecraft that put adventure above all else, in the style of old Dungeons and Dragons campaigns. Exploration is interesting, the dangers are greater and the sense of satisfaction of clearing out a dungeon is intense. The modlist is full of quality content from some very talented individuals. Be sure to head over to the donate page and show your appreciation!\r\n\r\nhttps:\/\/www.technicpack.net\/modpack\/hexxit.552552",
     "image": "quay.io\/pterodactyl\/core:java",
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Hexxit.jar",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"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}",
         "stop": "stop"
diff --git a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json
index 0180f3be..5c6c0d6d 100644
--- a/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json
+++ b/minecraft_java/technic/tekkit-legends/egg-tekkit-legends.json
@@ -3,14 +3,14 @@
     "meta": {
         "version": "PTDL_v1"
     },
-    "exported_at": "2018-02-26T20:41:35-05:00",
+    "exported_at": "2019-03-15T16:25:38+00:00",
     "name": "Tekkit Legends",
     "author": "aevum@decess.us",
     "description": "The ancient power of Tekkits past return in this legendary pack! Wield the philosopher's stone, ride the rails, breed the bees, and much, much more! This pack will remind you of what you've always loved about Tekkit, while bringing you new mods to discover and enjoy!\r\n\r\nhttps:\/\/www.technicpack.net\/modpack\/tekkit-legends.735902",
     "image": "quay.io\/pterodactyl\/core:java",
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar TekkitLegends.jar",
     "config": {
-        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"enable-query\": \"true\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
+        "files": "{\r\n    \"server.properties\": {\r\n        \"parser\": \"properties\",\r\n        \"find\": {\r\n            \"server-ip\": \"0.0.0.0\",\r\n            \"server-port\": \"{{server.build.default.port}}\",\r\n            \"query.port\": \"{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
         "startup": "{\r\n    \"done\": \")! For help, type \",\r\n    \"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}",
         "stop": "stop"