diff --git a/.gitignore b/.gitignore
index a3ccce0..10bc10c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-Pack.gma
-Changelog.txt
-Description.txt
\ No newline at end of file
+Pack.gma
\ No newline at end of file
diff --git a/Workshop Package.bat b/Workshop Package.bat
index 2988659..72ac74a 100644
--- a/Workshop Package.bat	
+++ b/Workshop Package.bat	
@@ -1,9 +1,6 @@
 @ECHO OFF
-:: Fallback
-SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
+SET "PWD=%~dp0"
+CALL build-env.bat
 
-:: Retrieve Garry's Mod path from Regristry
-FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "GARRYSMODPATH=%%B"
-
-"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%CD%\Source" -out "%CD%\Pack.gma"
+"%TOOLPATH%\bin\gmad.exe" create -folder "%PWD%\Source" -out "%PWD%\Pack.gma"
 PAUSE
\ No newline at end of file
diff --git a/Workshop Update.bat b/Workshop Update.bat
index 48f766d..bb640e1 100644
--- a/Workshop Update.bat	
+++ b/Workshop Update.bat	
@@ -1,7 +1,6 @@
 @ECHO OFF
-:: Fallback
-SET "GARRYSMODPATH=C:\Program Files (x86)\Steam\steamapps\common\GarrysMod"
+SET "PWD=%~dp0"
+CALL build-env.bat
 
-REM "%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739
-"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739 -icon "Logo.jpg" -addon "Pack.gma" -changes ""
+"%GARRYSMODPATH%\bin\gmpublish.exe" update -id %WORKSHOPID% -icon "Logo.jpg" -addon "Pack.gma" -changes ""
 PAUSE
\ No newline at end of file
diff --git a/build-env.bat b/build-env.bat
new file mode 100644
index 0000000..166b8f6
--- /dev/null
+++ b/build-env.bat
@@ -0,0 +1,2 @@
+SET "WORKSHOPID=468149739"
+FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Steam App 4000" /v InstallLocation') DO SET "TOOLPATH=%%B"
\ No newline at end of file