diff --git a/bukkit/install_script.sh b/bukkit/install_script.sh
index 18ab505..26e92db 100644
--- a/bukkit/install_script.sh
+++ b/bukkit/install_script.sh
@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -48,19 +47,25 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
 		mv $MC_DIR/craftbukkit-*.sh $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
 		chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
-fi
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
+		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
+		cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
 
-# Looking for run-${MC_VERSION}.sh
-if [ -e $MC_DIR/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
+		cd /MCserver
+		JAR=./craftbukkit-*.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
+		chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 fi
 
 echo "INFO ! Setting game port."
diff --git a/fabric/install_script.sh b/fabric/install_script.sh
index 4a045a6..01f7dbc 100644
--- a/fabric/install_script.sh
+++ b/fabric/install_script.sh
@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -48,19 +47,25 @@ if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
 		mv $MC_DIR/fabric-*-*.jar $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
 		chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
-fi
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
+		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
+		cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
 
-# Looking for run.sh
-if [ -e $MC_DIR/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 $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
+		cd /MCserver
+		JAR=./fabric-*-*.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
+		chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 fi
 
 echo "INFO ! Setting game port."
diff --git a/quilt/Install_Script.sh b/quilt/Install_Script.sh
index c844d58..e57e57d 100644
--- a/quilt/Install_Script.sh
+++ b/quilt/Install_Script.sh
@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 # Main Install Links
 INSTALLER_FILE=https://quiltmc.org/api/v1/download-latest-installer/java-universal
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/quilt/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -56,6 +55,25 @@ if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
 		mv * /$MC_DIR
 		cd ..
 		rm -fr server
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
+		mv -v run-*.sh old-server-versions/
+		cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
+
+		cd /MCserver
+		JAR=./quilt-server-launch.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
+		chmod +x run-$MC_TYPE-$MC_VERSION.sh
 		cd ..
 fi
 
diff --git a/testing/install_script.sh b/testing/install_script.sh
index 8743529..0c8c198 100644
--- a/testing/install_script.sh
+++ b/testing/install_script.sh
@@ -53,15 +53,15 @@ if [ $MC_TYPE = "vanilla" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -pv old-server-versions
+			mkdir -pv /old-server-versions/
 			rm -fr *.jar
 			rm -fr libraries
-			mv -v *.log /old-server-versions
+			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O MCserver-$MC_VERSION.jar
 			chmod +x MCserver-$MC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
-			mv -v run-*.sh /old-server-versions
+			mv -v run-*.sh old-server-versions/
 			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
 			#!/bin/bash
 			# Copyright (c) 2022 fithwum
@@ -92,15 +92,15 @@ elif [ $MC_TYPE = "bukkit" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -pv old-server-versions
+			mkdir -pv /old-server-versions/
 			rm -fr *.jar
 			rm -fr libraries
-			mv -v *.log /old-server-versions
+			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $BUKKIT_INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
 			chmod +x craftbukkit-$MC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
-			mv -v run-*.sh /old-server-versions
+			mv -v run-*.sh old-server-versions/
 			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
 			#!/bin/bash
 			# Copyright (c) 2022 fithwum
@@ -131,15 +131,15 @@ elif [ $MC_TYPE = "fabric" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -pv old-server-versions
+			mkdir -pv /old-server-versions/
 			rm -fr *.jar
 			rm -fr libraries
-			mv -v *.log /old-server-versions
+			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FABRIC_SERVER_FILE -O fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			chmod +x fabric-$MC_VERSION-$FABRIC_VERSION.jar
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
-			mv -v run-*.sh /old-server-versions
+			mv -v run-*.sh old-server-versions/
 			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
 			#!/bin/bash
 			# Copyright (c) 2022 fithwum
@@ -170,10 +170,10 @@ elif [ $MC_TYPE = "quilt" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -pv old-server-versions
+			mkdir -pv /old-server-versions/
 			rm -fr *.jar
 			rm -fr libraries
-			mv -v *.log /old-server-versions
+			mv -v *.log old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $QUILT_INSTALLER_FILE -O quilt-installer-$QUILT_VERSION.jar
 			chmod +x quilt-installer-$QUILT_VERSION.jar
 			java -jar quilt-installer-$QUILT_VERSION.jar install server $MC_VERSION --download-server
@@ -183,7 +183,7 @@ elif [ $MC_TYPE = "quilt" ]; then
 			rm -fr server
 			echo " "
 			echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
-			mv -v run-*.sh /old-server-versions
+			mv -v run-*.sh old-server-versions/
 			cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
 			#!/bin/bash
 			# Copyright (c) 2022 fithwum
@@ -216,11 +216,11 @@ elif [ $MC_TYPE = "forge" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -pv old-server-versions
+			mkdir -pv /old-server-versions/
 			rm -fr *.jar
 			rm -fr libraries
-			mv -v *.log /old-server-versions
-			mv -v run-*.sh /old-server-versions
+			mv -v *.log old-server-versions/
+			mv -v run-*.sh old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $FORGE_INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
 			chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
 			java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
@@ -250,11 +250,11 @@ elif [ $MC_TYPE = "neoforged" ]; then
 			echo " "
 			echo "INFO ! Cleaning old files."
 			cd $MC_DIR
-			mkdir -pv old-server-versions
+			mkdir -pv /old-server-versions/
 			rm -fr *.jar
 			rm -fr libraries
-			mv -v *.log /old-server-versions
-			mv -v run-*.sh /old-server-versions
+			mv -v *.log old-server-versions/
+			mv -v run-*.sh old-server-versions/
 			wget --no-cache --show-progress --progress=bar:force:noscroll $NEOFORGED_INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
 			chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
 			java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index 6e1984a..7b76d27 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -8,7 +8,6 @@ EULA_MARKER=$MC_DIR/.eula_accepted
 
 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://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/vanilla/run.sh
 
 # Install java
 if dpkg -s openjdk-$JAVA_VERSION-jre-headless &> /dev/null
@@ -48,19 +47,25 @@ if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
 		mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
 		chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
-fi
+		echo " "
+		echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
+		mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
+		cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
+		#!/bin/bash
+		# Copyright (c) 2022 fithwum
+		# All rights reserved
 
-# Looking for run-${MC_VERSION}.sh
-if [ -e $MC_DIR/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
+		cd /MCserver
+		JAR=./MCserver-*.jar
+
+		while [ true ]; do
+			java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
+			if [ $? -eq 0 ]; then
+				break
+			fi
+		done
+		EOF
+		chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
 fi
 
 echo "INFO ! Setting game port."