diff --git a/Clone_Game_Website_Wiki_Windows.cmd b/Clone_Game_Website_Wiki_Windows.cmd
deleted file mode 100644
index 0e65d8b..0000000
--- a/Clone_Game_Website_Wiki_Windows.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-
@echo off
-echo:
-echo Cloning the game repository.
-make clone-windows-game
-echo:
-echo:
-echo Cloning the website repository.
-echo:
-make clone-windows-website
-echo:
-echo:
-echo Cloning the wiki repository.
-echo:
-make clone-windows-wiki
-echo:
-pause
diff --git a/Clone_Game_Website_Windows.cmd b/Clone_Game_Website_Windows.cmd
deleted file mode 100644
index ea7eed7..0000000
--- a/Clone_Game_Website_Windows.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-
@echo off
-echo:
-echo Cloning the game repository.
-echo:
-make clone-windows-game
-echo:
-echo:
-echo Cloning the website repository.
-echo:
-make clone-windows-website
-echo:
-pause
diff --git a/Clone_Game_Windows.cmd b/Clone_Game_Windows.cmd
deleted file mode 100644
index 538e9cc..0000000
--- a/Clone_Game_Windows.cmd
+++ /dev/null
@@ -1,7 +0,0 @@
-
@echo off
-echo:
-echo Cloning the game repository.
-echo:
-make clone-windows-game
-echo:
-pause
diff --git a/Import_Databases_Windows.cmd b/Import_Databases_Windows.cmd
deleted file mode 100644
index 312c05d..0000000
--- a/Import_Databases_Windows.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-
@echo off
-echo:
-echo Attempting to import (or overwrite) the game database.
-echo:
-make import-windows-game
-echo:
-echo:
-echo Attempting to import (or overwrite) the website database.
-echo:
-make import-windows-website
-echo:
-echo:
-echo Attempting to import (or overwrite) the wiki database.
-echo:
-make import-windows-wiki
-echo:
-pause
diff --git a/Makefile b/Makefile
index 8935796..ce9da56 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ pull-website-windows:
 	@cd Website && git reset HEAD --hard &&  git pull
 
 pull-wiki-windows:
-	@cd Website/Wiki git reset HEAD --hard &&  && git pull
+	@cd Website/Wiki git reset HEAD --hard && git pull
 
 logs:
 	@docker-compose logs -f
diff --git a/Setup_Windows.cmd b/Setup_Windows.cmd
index 16890bf..1f65e1b 100644
--- a/Setup_Windows.cmd
+++ b/Setup_Windows.cmd
@@ -189,6 +189,8 @@ echo:
 make start
 echo:
 echo:
+
+:edition
 echo:
 echo Open RSC Installer
 echo An easy to run RSC private server environment using Docker magic.
@@ -198,8 +200,35 @@ echo  1 - Single player RSC game + basic database editing (using PHPMyAdmin)
 echo  2 - Game + Website + PHPMyAdmin
 echo  3 - Game + Website + PHPMyAdmin + RSC Preservation Wiki
 echo:
-SET /P choice=Which of the above do you want? Type 1, 2, or 3, and press enter."
+SET /P edition=Which of the above do you want? Type 1, 2, or 3, and press enter."
 echo:
+
+IF /i "%edition%"=="1" goto game
+IF /i "%edition%"=="2" goto gameweb
+IF /i "%edition%"=="3" goto gamewebwiki
+
+echo Error! %edition% is not a valid option. Press enter to try again."
+echo:
+SET /P edition=""
+goto edition
+
+:game
+echo:
+echo Downloading a copy of the Game repository
+echo:
+make clone-windows-game
+echo:
+echo:
+echo Importing the game databases.
+echo:
+make pull-game-windows
+echo:
+make import-windows-game
+echo:
+echo:
+goto final
+
+:gameweb
 echo:
 echo Downloading a copy of the Website repository
 echo:
@@ -211,10 +240,7 @@ echo:
 make clone-windows-game
 echo:
 echo:
-echo Downloading a copy of the Wiki repository
-echo:
-make clone-windows-wiki
-echo:
+make pull-game-windows
 echo:
 echo Importing the game databases.
 echo:
@@ -223,6 +249,43 @@ echo:
 echo:
 echo Importing the website database.
 echo:
+make pull-website-windows
+echo:
+make import-windows-website
+echo:
+echo:
+goto final
+
+:gamewebwiki
+echo:
+echo Downloading a copy of the Website repository
+echo:
+make clone-windows-website
+echo:
+echo:
+echo Downloading a copy of the Game repository
+echo:
+make clone-windows-game
+echo:
+echo:
+make pull-wiki-windows
+echo:
+echo Downloading a copy of the Wiki repository
+echo:
+make clone-windows-wiki
+echo:
+echo:
+make pull-game-windows
+echo:
+echo Importing the game databases.
+echo:
+make import-windows-game
+echo:
+echo:
+echo Importing the website database.
+echo:
+make pull-website-windows
+echo:
 make import-windows-website
 echo:
 echo:
@@ -235,6 +298,9 @@ echo Importing the wiki database.
 echo:
 make import-windows-wiki
 echo:
+goto final
+
+:final
 echo:
 echo Extracting client cache
 echo: