diff --git a/optional/startmenu/WinAuth.lnk b/optional/startmenu/WinAuth.lnk
index ba09bdf..27a41cd 100644
Binary files a/optional/startmenu/WinAuth.lnk and b/optional/startmenu/WinAuth.lnk differ
diff --git a/optional/unpack-winauth.cmd b/optional/unpack-winauth.cmd
index 6e510ba..74925b0 100644
--- a/optional/unpack-winauth.cmd
+++ b/optional/unpack-winauth.cmd
@@ -15,7 +15,7 @@ echo killing WinAuth processes...
 taskkill /F /IM winauth.exe 2>nul
 
 echo unpacking WinAuth ...
-%TOOLS%\7z x -y -aoa -o"%TOOLS%" %ZIP%
+%TOOLS%\7z x -y -aoa -o"%ProgramFiles(x86)%" %ZIP%
 
 echo copy startmenu link ...
 copy /Y startmenu\WinAuth.lnk %STARTMENU%
diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 31e4ec2..2f04636 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -206,6 +206,9 @@ rem ... stupid os problem #3
 call cleanup-programlist.cmd
 echo.
 
+rem ... remove stupid public folders
+call cleanup-publicdir.cmd
+
 date /t
 time /t
 echo ####### %0 #######
diff --git a/scripts/cleanup-publicdir.cmd b/scripts/cleanup-publicdir.cmd
new file mode 100644
index 0000000..5a5037d
--- /dev/null
+++ b/scripts/cleanup-publicdir.cmd
@@ -0,0 +1,13 @@
+@echo off
+
+echo ####### %0 #######
+
+echo removing useless directories in PUBLIC folder ...
+rd /S /Q %PUBLIC%\Documents 2>nul
+rd /S /Q %PUBLIC%\Downloads 2>nul
+rd /S /Q %PUBLIC%\Pictures 2>nul
+rd /S /Q %PUBLIC%\Videos 2>nul
+rd /S /Q %PUBLIC%\Roaming 2>nul
+
+echo ####### %0 #######
+