diff --git a/bedrock/install_script.sh b/bedrock/install_script.sh
index 5f7181e..d41980b 100644
--- a/bedrock/install_script.sh
+++ b/bedrock/install_script.sh
@@ -7,7 +7,7 @@
 
 VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
 MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
-MC_RUN_FILE=https://raw.githubusercontent.com/fithwum/minecraft/refs/heads/master/vanilla/run.sh
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bedrock/run.sh
 
 rm -fr /MCserver/MCserver_*.jar
 rm -fr /MCserver/run_*.sh
@@ -21,16 +21,17 @@ if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
 	else
 		echo " "
 		echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir /MCserver/old-server-versions/
-			mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
-			mv /MCserver/run-*.sh /MCserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions/
+		mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		chmod +x /MCserver/MCserver-$MC_VERSION.jar
 fi
 
 sleep 1
-https://gitlab.fithwum.tech/fithwum/minecraft/-/raw/master/
+
 # Looking for run-${MC_VERSION}.sh
 if [ -e /MCserver/run-$MC_VERSION.sh ]
 	then
@@ -40,6 +41,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
 fi
 
 sleep 1
@@ -93,8 +95,6 @@ sleep 1
 # Set permissions.
 chown 99:100 -R /MCserver
 chmod 777 -R /MCserver
-chmod +x /MCserver/run-$MC_VERSION.sh
-chmod +x /MCserver/MCserver-$MC_VERSION.jar
 
 sleep 1
 
diff --git a/fabric/install_script.sh b/fabric/install_script.sh
index 61a4611..a2f6829 100644
--- a/fabric/install_script.sh
+++ b/fabric/install_script.sh
@@ -17,11 +17,12 @@ if [ -e /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
 	else
 		echo " "
 		echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir /MCserver/old-server-versions
-			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions
+		mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+		chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 fi
 
 sleep 1
@@ -36,6 +37,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
 		mv /MCserver/run-*.sh /MCserver/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
 fi
 
 # Check for EULA
@@ -87,8 +89,6 @@ sleep 1
 # Set permissions.
 chown 99:100 -R /MCserver
 chmod 777 -R /MCserver
-chmod +x /MCserver/run-$MC_VERSION.sh
-chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 
 sleep 1
 
diff --git a/neoforged/Install_Script.sh b/neoforged/Install_Script.sh
index 4d513a0..7c6065e 100644
--- a/neoforged/Install_Script.sh
+++ b/neoforged/Install_Script.sh
@@ -28,32 +28,33 @@ if [ -e /MCserver/neoforge-$NEOFORGED_VERSION-beta-installer.jar ]
 	else
 		echo " "
 		echo "WARNING ! neoforge-$NEOFORGED_VERSION-beta-installer.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			cd /MCserver
-			rm -fr neoforge-*.jar
-			wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-beta-installer.jar
-			chmod +x neoforge-$NEOFORGED_VERSION-beta-installer.jar
-			java -jar neoforge-$NEOFORGED_VERSION-beta-installer.jar --installServer
-			# mv run.sh run-$NEOFORGED_VERSION.sh
-			# chmod +x run-$NEOFORGED_VERSION.sh
-			cd ..
+		echo " "
+		echo "INFO ! Cleaning old files."
+		cd /MCserver
+		rm -fr neoforge-*.jar
+		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-beta-installer.jar
+		chmod +x neoforge-$NEOFORGED_VERSION-beta-installer.jar
+		java -jar neoforge-$NEOFORGED_VERSION-beta-installer.jar --installServer
+		# mv run.sh run-$NEOFORGED_VERSION.sh
+		# chmod +x run-$NEOFORGED_VERSION.sh
+		cd ..
 fi
 
 if [ -e /MCserver/server-$SERVER_VERSION.jar ]
 	then
 		echo " "
 		echo "INFO ! server-$SERVER_VERSION.jar found starting now."
-			exec /MCserver/run-$NEOFORGED_VERSION.sh
+		# cd /MCserver
+		# exec /MCserver/run-$NEOFORGED_VERSION.sh
 	else
 		echo " "
 		echo "WARNING ! server-$SERVER_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			rm -fr /MCserver/server-*.jar
-			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/server-$SERVER_VERSION.jar
-			chmod +x /MCserver/server-$SERVER_VERSION.jar
-			exec /MCserver/run-$NEOFORGED_VERSION.sh
+		echo " "
+		echo "INFO ! Cleaning old files."
+		rm -fr /MCserver/server-*.jar
+		wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/server-$SERVER_VERSION.jar
+		chmod +x /MCserver/server-$SERVER_VERSION.jar
+		# exec /MCserver/run-$NEOFORGED_VERSION.sh
 fi
 
 sleep 1
diff --git a/testing-fabric/install_script.sh b/testing-fabric/install_script.sh
index 61a4611..a2f6829 100644
--- a/testing-fabric/install_script.sh
+++ b/testing-fabric/install_script.sh
@@ -17,11 +17,12 @@ if [ -e /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
 	else
 		echo " "
 		echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir /MCserver/old-server-versions
-			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions
+		mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+		chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 fi
 
 sleep 1
@@ -36,6 +37,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
 		mv /MCserver/run-*.sh /MCserver/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
 fi
 
 # Check for EULA
@@ -87,8 +89,6 @@ sleep 1
 # Set permissions.
 chown 99:100 -R /MCserver
 chmod 777 -R /MCserver
-chmod +x /MCserver/run-$MC_VERSION.sh
-chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 
 sleep 1
 
diff --git a/testing-neoforged/Dockerfile b/testing-neoforged/Dockerfile
index 3dfe870..7828846 100644
--- a/testing-neoforged/Dockerfile
+++ b/testing-neoforged/Dockerfile
@@ -3,7 +3,8 @@ LABEL maintainer="fithwum"
 
 ENV ACCEPT_EULA=""
 ENV GAME_PORT=""
-ENV NEOFORGE_VERSION=""
+ENV SERVER_VERSION=""
+ENV NEOFORGED_VERSION=""
 ENV XMX_SIZE=""
 ENV XMS_SIZE=""
 ENV XMN_SIZE=""
diff --git a/testing-neoforged/Install_Script.sh b/testing-neoforged/Install_Script.sh
index 939b24c..4d513a0 100644
--- a/testing-neoforged/Install_Script.sh
+++ b/testing-neoforged/Install_Script.sh
@@ -3,41 +3,61 @@
 # All rights reserved
 
 # Main Install Links
-SERVER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGE_VERSION-beta/neoforge-$NEOFORGE_VERSION-beta-installer.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
-
-rm -fr /MCserver/run_*.sh
+INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION-beta/neoforge-$NEOFORGED_VERSION-beta-installer.jar
+SERVER_FILE=https://github.com/neoforged/ServerStarterJar/releases/download/$SERVER_VERSION/server.jar
+MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
 
 # Main install (Debian).
 # Check for server files and download if needed.
-if [ -e /MCserver/neoforge-$NEOFORGE_VERSION-beta-installer.jar ]
+if [ -e /MCserver/run-$NEOFORGED_VERSION.sh ]
 	then
 		echo " "
-		echo "INFO ! neoforge-$NEOFORGE_VERSION-beta-installer.jar found installing now."
+		echo "INFO ! run-$NEOFORGED_VERSION.sh found ... will use existing file."
 	else
 		echo " "
-		echo "WARNING ! neoforge-$NEOFORGE_VERSION-beta-installer.jar is out of date/missing ... will download now."
+		echo "WARNING ! run-$NEOFORGED_VERSION.sh is out of date/missing ... will download now."
+		rm -fr /MCserver/run-*.sh
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$NEOFORGED_VERSION.sh
+		chmod +x /MCserver/run-$NEOFORGED_VERSION.sh
+fi
+
+if [ -e /MCserver/neoforge-$NEOFORGED_VERSION-beta-installer.jar ]
+	then
+		echo " "
+		echo "INFO ! neoforge-$NEOFORGED_VERSION-beta-installer.jar found starting now."
+	else
+		echo " "
+		echo "WARNING ! neoforge-$NEOFORGED_VERSION-beta-installer.jar is out of date/missing ... will download now."
 			echo " "
 			echo "INFO ! Cleaning old files."
-			mkdir /MCserver/old-server-versions
-			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/neoforge-$NEOFORGE_VERSION-beta-installer.jar
+			cd /MCserver
+			rm -fr neoforge-*.jar
+			wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-beta-installer.jar
+			chmod +x neoforge-$NEOFORGED_VERSION-beta-installer.jar
+			java -jar neoforge-$NEOFORGED_VERSION-beta-installer.jar --installServer
+			# mv run.sh run-$NEOFORGED_VERSION.sh
+			# chmod +x run-$NEOFORGED_VERSION.sh
+			cd ..
+fi
+
+if [ -e /MCserver/server-$SERVER_VERSION.jar ]
+	then
+		echo " "
+		echo "INFO ! server-$SERVER_VERSION.jar found starting now."
+			exec /MCserver/run-$NEOFORGED_VERSION.sh
+	else
+		echo " "
+		echo "WARNING ! server-$SERVER_VERSION.jar is out of date/missing ... will download now."
+			echo " "
+			echo "INFO ! Cleaning old files."
+			rm -fr /MCserver/server-*.jar
+			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/server-$SERVER_VERSION.jar
+			chmod +x /MCserver/server-$SERVER_VERSION.jar
+			exec /MCserver/run-$NEOFORGED_VERSION.sh
 fi
 
 sleep 1
 
-# Looking for run.sh
-if [ -e /MCserver/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
-		mv /MCserver/run-*.sh /MCserver/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
-fi
-
 # Check for EULA
 if [ ! -f /MCserver/eula.txt ]; then
 	:
@@ -66,7 +86,7 @@ if [ "$ACCEPT_EULA" == "true" ]; then
 		echo " "
 		echo "INFO ! EULA accepted, server restarting, please wait..."
 		sleep 1
-		exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+		exec /MCserver/run-$NEOFORGED_VERSION.sh --dataPath=/MCserver
 		exit 0
 	fi
 elif [ "$ACCEPT_EULA" == "false" ]; then
@@ -80,21 +100,29 @@ else
 fi
 
 sleep 1
+
 echo "INFO ! Setting game port."
 sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /MCserver/server.properties
+
+sleep 1
+
+echo "INFO ! Setting java settings."
+sed -i '/-Xmx='*'/c\-Xmx='$XMX_SIZE'' /MCserver/user_jvm_args.txt
+sed -i '/-Xms='*'/c\-Xms='$XMS_SIZE'' /MCserver/user_jvm_args.txt
+sed -i '/-Xmn='*'/c\-Xmn='$XMN_SIZE'' /MCserver/user_jvm_args.txt
+
 sleep 1
 
 # Set permissions.
 chown 99:100 -R /MCserver
 chmod 777 -R /MCserver
-chmod +x /MCserver/run-$MC_VERSION.sh
-chmod +x /MCserver/neoforge-$NEOFORGE_VERSION-beta-installer.jar
 
 sleep 1
 
 # Run Minecraft server.
 echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION"
-exec /MCserver/run-$MC_VERSION.sh #--dataPath=/MCserver
+echo "INFO ! Starting Minecraft Server $NEOFORGED_VERSION"
+cd /MCserver
+exec /run-$NEOFORGED_VERSION.sh #--dataPath=/MCserver
 
 exit
\ No newline at end of file
diff --git a/testing-neoforged/run.sh b/testing-neoforged/run.sh
index c9e2f8b..0094f67 100644
--- a/testing-neoforged/run.sh
+++ b/testing-neoforged/run.sh
@@ -3,10 +3,10 @@
 # All rights reserved
 
 cd /MCserver
-JAR=./server.jar
+JAR=./server-*.jar
 
 while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui "$@"
   if [ $? -eq 0 ]; then
     break
   fi
diff --git a/testing-vanilla/install_script.sh b/testing-vanilla/install_script.sh
index 9c6695d..db2e4e6 100644
--- a/testing-vanilla/install_script.sh
+++ b/testing-vanilla/install_script.sh
@@ -21,12 +21,13 @@ if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
 	else
 		echo " "
 		echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir /MCserver/old-server-versions/
-			mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
-			mv /MCserver/run-*.sh /MCserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions/
+		mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		chmod +x /MCserver/MCserver-$MC_VERSION.jar
 fi
 
 sleep 1
@@ -40,6 +41,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
 fi
 
 sleep 1
@@ -93,8 +95,6 @@ sleep 1
 # Set permissions.
 chown 99:100 -R /MCserver
 chmod 777 -R /MCserver
-chmod +x /MCserver/run-$MC_VERSION.sh
-chmod +x /MCserver/MCserver-$MC_VERSION.jar
 
 sleep 1
 
diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index c193104..5f65bc4 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -18,12 +18,13 @@ if [ -e /MCserver/MCserver-$MC_VERSION.jar ]
 	else
 		echo " "
 		echo "WARNING ! MCserver-$MC_VERSION.jar is out of date/missing ... will download now."
-			echo " "
-			echo "INFO ! Cleaning old files."
-			mkdir /MCserver/old-server-versions/
-			mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
-			mv /MCserver/run-*.sh /MCserver/old-server-versions/
-			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		echo " "
+		echo "INFO ! Cleaning old files."
+		mkdir /MCserver/old-server-versions/
+		mv /MCserver/MCserver-*.jar /MCserver/old-server-versions/
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /MCserver/MCserver-$MC_VERSION.jar
+		chmod +x /MCserver/MCserver-$MC_VERSION.jar
 fi
 
 sleep 1
@@ -37,6 +38,7 @@ if [ -e /MCserver/run-$MC_VERSION.sh ]
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+		chmod +x /MCserver/run-$MC_VERSION.sh
 fi
 
 sleep 1
@@ -90,8 +92,6 @@ sleep 1
 # Set permissions.
 chown 99:100 -R /MCserver
 chmod 777 -R /MCserver
-chmod +x /MCserver/run-$MC_VERSION.sh
-chmod +x /MCserver/MCserver-$MC_VERSION.jar
 
 sleep 1