diff --git a/Uninstall.bat b/Uninstall.bat
new file mode 100644
index 00000000..422655de
--- /dev/null
+++ b/Uninstall.bat
@@ -0,0 +1,32 @@
+@echo off 
+cd /D %~dp0
+TITLE KoboldAI Uninstall Helper
+SET /P M=<loader.settings
+IF %M%==3 subst /D B:
+IF %M%==1 subst /D K:
+
+IF "%1" == "FORCE" GOTO UNINSTALL
+
+IF EXIST "Uninstall\unins000.exe" (
+   start Uninstall\unins000.exe
+   exit
+) ELSE (
+   echo This will remove all KoboldAI folders that do not contain user data
+	pause
+	GOTO UNINSTALL
+)
+
+:UNINSTALL
+echo Uninstallation in progress, please wait...
+set DM=Y
+attrib -h .git >nul
+for /d %%D in (*) do if not "%%~nxD"=="stories" if not "%%~nxD"=="userscripts" if not "%%~nxD"=="settings" if not "%%~nxD"=="softprompts" if not "%%~nxD"=="models" if not "%%~nxD"=="Uninstall" rmdir /S /Q %%~nxD
+for %%i in (*) do if not "%%i"=="Uninstall.bat" del /q "%%i"
+set /P DM=Would you like to delete the models folder? (Y/n) :
+IF %DM%==Y rmdir models /s /q
+IF %DM%==y rmdir models /s /q
+set DM=N
+set /P DM=Would you like to delete all other user folders? (y/N) :
+IF %DM%==Y rmdir stories userscripts settings softprompts /s /q
+IF %DM%==y rmdir stories userscripts settings softprompts /s /q
+del Uninstall.bat
\ No newline at end of file
diff --git a/update-koboldai.bat b/update-koboldai.bat
index 05ae280e..26e9ec17 100644
--- a/update-koboldai.bat
+++ b/update-koboldai.bat
@@ -50,4 +50,4 @@ git remote add origin %origin%
 git fetch --all
 git checkout %branch% -f
 git reset --hard origin/%branch%
-cmd /k
\ No newline at end of file
+%windir%\system32\timeout -t 10
\ No newline at end of file