diff --git a/image/StartCustomSetup.cmd b/image/SearchAutoconfig.cmd
similarity index 73%
rename from image/StartCustomSetup.cmd
rename to image/SearchAutoconfig.cmd
index a4befcb..e3704d0 100644
--- a/image/StartCustomSetup.cmd
+++ b/image/SearchAutoconfig.cmd
@@ -1,6 +1,6 @@
 @echo off
-set LOG=c:\StartCustomSetup.txt
-set BATCH=CustomSetup.cmd
+set LOG=%SystemDrive%\SearchAutoconfig.txt
+set BATCH=StartAutoconfig.cmd
 
 if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
 shift /1
@@ -10,7 +10,7 @@ date /t
 time /t
 echo.
 
-rem scan for the USB stick (infinite) ...
+rem scan for the USB media (infinite) ...
 :loop
 for %%D in (A B D E F G H I J K L M N O P Q R S T U V W X Y Z) do (
 
@@ -26,7 +26,7 @@ for %%D in (A B D E F G H I J K L M N O P Q R S T U V W X Y Z) do (
 )
 
 echo INFO: Calling the GUI helper to prompt the user to use a different USB port ...
-prompt-user "Custom setup script NOT found! Please disconnect the USB stick and connect it to another USB port. Then click on OK."
+prompt-user "Custom setup script NOT found! Please disconnect the USB media and connect it to another USB port. Then click on OK."
 
 goto loop
 
diff --git a/image/SetupComplete.cmd b/image/SetupComplete.cmd
index 08422af..db2c54a 100644
--- a/image/SetupComplete.cmd
+++ b/image/SetupComplete.cmd
@@ -1,5 +1,5 @@
 @echo off
-set LOG=c:\SetupComplete.txt
+set LOG=%SystemDrive%\SetupComplete.txt
 
 del /F %LOG% 1>nul 2>nul
 if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
diff --git a/image/CustomSetup.cmd b/image/StartAutoconfig.cmd
similarity index 82%
rename from image/CustomSetup.cmd
rename to image/StartAutoconfig.cmd
index 6370793..f6044d0 100644
--- a/image/CustomSetup.cmd
+++ b/image/StartAutoconfig.cmd
@@ -1,10 +1,10 @@
 @echo off
 rem this script puts everything in place ...
 
-set TOOLS=c:\tools
+set TOOLS=%SystemDrive%\tools
 set SXS=%WINDIR%\sources\sxs
-set BATCH=%TOOLS%\scripts\autoconfig-all.cmd
-set LOG=c:\CustomSetup.txt
+set BATCH=%TOOLS%\scripts\autoconfig.cmd
+set LOG=%SystemDrive%\StartAutoconfig.txt
 
 del /F %LOG% 1>nul 2>nul
 if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
diff --git a/image/autounattend_BIOS_template.xml b/image/autounattend_BIOS_template.xml
index 9b62d95..6889420 100644
--- a/image/autounattend_BIOS_template.xml
+++ b/image/autounattend_BIOS_template.xml
@@ -132,7 +132,7 @@
                 <SynchronousCommand wcm:action="add">
                     <Order>2</Order>
                     <Description>Initial Setup</Description>
-                    <CommandLine>cmd /C c:\windows\setup\scripts\StartCustomSetup.cmd</CommandLine>
+                    <CommandLine>cmd /C c:\windows\setup\scripts\SearchAutoconfig.cmd</CommandLine>
                 </SynchronousCommand>
             </FirstLogonCommands>
         </component>
diff --git a/image/autounattend_UEFI_template.xml b/image/autounattend_UEFI_template.xml
index 1db148e..1380751 100644
--- a/image/autounattend_UEFI_template.xml
+++ b/image/autounattend_UEFI_template.xml
@@ -153,7 +153,7 @@
                 <SynchronousCommand wcm:action="add">
                     <Order>2</Order>
                     <Description>Initial Setup</Description>
-                    <CommandLine>cmd /C c:\windows\setup\scripts\StartCustomSetup.cmd</CommandLine>
+                    <CommandLine>cmd /C c:\windows\setup\scripts\SearchAutoconfig.cmd</CommandLine>
                 </SynchronousCommand>
             </FirstLogonCommands>
         </component>
diff --git a/image/export-image.cmd b/image/export-image.cmd
index 346603c..fdf988d 100644
--- a/image/export-image.cmd
+++ b/image/export-image.cmd
@@ -1,5 +1,5 @@
 @echo off
-set SOURCES=c:\TEMP\W10\sources
+set SOURCES=%SystemDrive%\TEMP\W10\sources
 set WIM=%SOURCES%\install.wim
 set W10PRO=%SOURCES%\w10pro.wim
 set STATEFILE=%SOURCES%\w10pro.txt
diff --git a/image/finish-boot.cmd b/image/finish-boot.cmd
index 59074bc..a9d2189 100644
--- a/image/finish-boot.cmd
+++ b/image/finish-boot.cmd
@@ -1,6 +1,6 @@
 @echo off
-set SOURCES=c:\TEMP\W10\sources
-set BOOT=c:\TEMP\BOOT
+set SOURCES=%SystemDrive%\TEMP\W10\sources
+set BOOT=%SystemDrive%\TEMP\BOOT
 set SETTINGS=..\scripts\settings.cmd
 
 if EXIST %SETTINGS% (
diff --git a/image/finish-image.cmd b/image/finish-image.cmd
index 679606e..05c6e5b 100644
--- a/image/finish-image.cmd
+++ b/image/finish-image.cmd
@@ -1,6 +1,6 @@
 @echo off
-set IMAGE=c:\TEMP\IMAGE
-set SOURCES=c:\TEMP\W10\sources
+set IMAGE=%SystemDrive%\TEMP\IMAGE
+set SOURCES=%SystemDrive%\TEMP\W10\sources
 set WIM=%SOURCES%\install.wim
 
 if NOT EXIST %WIM% (
@@ -13,7 +13,7 @@ rd /S /Q %IMAGE%\Windows\Setup\scripts 1>nul 2>nul
 mkdir %IMAGE%\Windows\Setup\scripts 1>nul 2>nul
 
 echo [%0] INFO: copying scripts to %IMAGE%\Windows\Setup\scripts ...
-copy /Y SetupComplete.cmd %IMAGE%\Windows\Setup\scripts
+copy /Y SetupCompleted.cmd %IMAGE%\Windows\Setup\scripts
 copy /Y StartCustomSetup.cmd %IMAGE%\Windows\Setup\scripts
 copy /Y ..\tools\prompt-user.exe %IMAGE%\Windows
 
diff --git a/image/get-wiminfo.cmd b/image/get-wiminfo.cmd
index 4eaf875..a0f4631 100644
--- a/image/get-wiminfo.cmd
+++ b/image/get-wiminfo.cmd
@@ -1,5 +1,5 @@
 @echo off
-set SOURCES=c:\TEMP\W10\sources
+set SOURCES=%SystemDrive%\TEMP\W10\sources
 set FILENAME=%1
 
 IF %1.==. GOTO USAGE
diff --git a/image/mount-boot.cmd b/image/mount-boot.cmd
index b0a5ee5..0155113 100644
--- a/image/mount-boot.cmd
+++ b/image/mount-boot.cmd
@@ -1,6 +1,6 @@
 @echo off
-set SOURCES=c:\TEMP\W10\sources
-set BOOT=c:\TEMP\BOOT
+set SOURCES=%SystemDrive%\TEMP\W10\sources
+set BOOT=%SystemDrive%\TEMP\BOOT
 
 rem check for wim file ...
 if NOT EXIST %SOURCES%\boot.wim (
diff --git a/image/mount-image.cmd b/image/mount-image.cmd
index d99aa64..ed477fe 100644
--- a/image/mount-image.cmd
+++ b/image/mount-image.cmd
@@ -1,6 +1,6 @@
 @echo off
-set SOURCES=c:\TEMP\W10\sources
-set IMAGE=c:\TEMP\IMAGE
+set SOURCES=%SystemDrive%\TEMP\W10\sources
+set IMAGE=%SystemDrive%\TEMP\IMAGE
 
 rem check for wim file ...
 if NOT EXIST %SOURCES%\install.wim (
diff --git a/image/remove-apps.cmd b/image/remove-apps.cmd
index 7d114e2..5a99b02 100644
--- a/image/remove-apps.cmd
+++ b/image/remove-apps.cmd
@@ -1,5 +1,5 @@
 @echo off
-set IMAGE=c:\TEMP\IMAGE
+set IMAGE=%SystemDrive%\TEMP\IMAGE
 
 FOR /F %%P in (apps-to-remove.csv) do (
 
diff --git a/image/umount-all.cmd b/image/umount-all.cmd
index 783a2a0..be084a0 100644
--- a/image/umount-all.cmd
+++ b/image/umount-all.cmd
@@ -1,6 +1,6 @@
 @echo off
-set IMAGE=c:\TEMP\IMAGE
-set BOOT=c:\TEMP\BOOT
+set IMAGE=%SystemDrive%\TEMP\IMAGE
+set BOOT=%SystemDrive%\TEMP\BOOT
 
 echo unmounting image and discarding changes ...
 dism /Unmount-Wim /MountDir:%IMAGE% /Discard
diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig.cmd
similarity index 94%
rename from scripts/autoconfig-all.cmd
rename to scripts/autoconfig.cmd
index a410d26..9acde37 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig.cmd
@@ -5,7 +5,7 @@ set T=%SystemDrive%\TEMP
 set TOOLS=%SystemDrive%\tools
 set SETTINGS=settings.cmd
 set SCRIPTS=%TOOLS%\scripts
-set LOG=%SCRIPTS%\autoconfig-all.txt
+set LOG=%SCRIPTS%\autoconfig.txt
 
 del /F %LOG% 1>nul 2>nul
 if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
diff --git a/scripts/set-permissions.cmd b/scripts/set-permissions.cmd
index 975c58a..9562a14 100644
--- a/scripts/set-permissions.cmd
+++ b/scripts/set-permissions.cmd
@@ -4,13 +4,6 @@ set TOOLS=c:\tools
 
 echo ####### %0 #######
 
-takeown /F c:\*.txt /A 1>nul
-icacls c:\*.txt /inheritance:r 1>nul
-icacls c:\*.txt /grant Administrators:F 1>nul
-icacls c:\*.txt /grant Users:RX 1>nul
-
-echo.
-echo working on folder [ %TOOLS% ] ...
 takeown /F %TOOLS% /R /A /D Y 1>nul
 icacls %TOOLS% /inheritance:r
 icacls %TOOLS% /grant Administrators:F /t /c /l 1>nul
diff --git a/tools/personalfiles.cmd b/tools/personalfiles.cmd
index b0fba90..17c4e36 100644
--- a/tools/personalfiles.cmd
+++ b/tools/personalfiles.cmd
@@ -8,7 +8,7 @@ set TOOLS=c:\tools
 set SCRIPT_SETTINGS=%TOOLS%\scripts\settings.cmd
 set COMPANY_SETTINGS=%TOOLS%\company\settings.cmd
 set PERSONALFILES_DONE=%LOCALAPPDATA%\.personalfiles_done
-set GITWORKDIR=%USERPROFILE%\workspace\git
+set GITWORKDIR=%USERPROFILE%\workspace
 set gitrepo=undefined
 set gitserver=undefined