diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 00ec1dd..f4b319d 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -61,6 +61,9 @@ echo.
call modify-path.cmd
echo.
+call modify-explorer.cmd
+echo.
+
call modify-powersettings.cmd
echo.
diff --git a/scripts/config/OpenshellSettings.xml b/scripts/config/OpenshellSettings.xml
index a00a07c..3be4ce1 100644
--- a/scripts/config/OpenshellSettings.xml
+++ b/scripts/config/OpenshellSettings.xml
@@ -225,10 +225,11 @@
Item14.Settings=ITEM_DISABLED
Item15.Command=separator
Item16.Command=control_panel
- Item16.Settings=TRACK_RECENT
+ Item16.Settings=TRACK_RECENT|ITEM_DISABLED
Item17.Command=admin
Item17.Settings=TRACK_RECENT
Item18.Command=devices
+ Item18.Settings=ITEM_DISABLED
Item19.Command=defaults
Item19.Settings=ITEM_DISABLED
Item20.Command=help
diff --git a/scripts/modify-explorer.cmd b/scripts/modify-explorer.cmd
new file mode 100644
index 0000000..06e0389
--- /dev/null
+++ b/scripts/modify-explorer.cmd
@@ -0,0 +1,24 @@
+@echo off
+
+echo ####### %0 #######
+
+echo disable quick access ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" ^
+ /v "HubMode" /t REG_DWORD /d 1 /f 1>nul
+
+echo disable network icon ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\NonEnum" ^
+ /v "{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}" /t REG_DWORD /d 1 /f 1>nul
+
+echo removing other BULLSHIT ...
+
+rem 3d Objects ...
+reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}" /f 1>nul
+reg delete "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\NameSpace\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}" /f 1>nul
+
+echo restarting explorer ...
+taskkill /f /im explorer.exe 1>nul 2>nul
+start explorer.exe
+
+echo ####### %0 #######
+
diff --git a/tools/logon.cmd b/tools/logon.cmd
index bd4c339..30b8f00 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -128,10 +128,29 @@ echo 1 >%STATUSFILE%
echo.
echo #####
-echo #####
+echo ##### cleaning ...
echo #####
echo.
+echo 3D Objects ...
+rd /S /Q %USERPROFILE%\"3D Objects" 2>nul
+
+echo Contacts ...
+rd /S /Q %USERPROFILE%\Contacts 2>nul
+
+echo Favorites ...
+rd /S /Q %USERPROFILE%\Favorites 2>nul
+
+echo Saved Games (folder used by Microsoft only) ...
+rd /S /Q %USERPROFILE%\"Saved Games" 2>nul
+
+echo Links ...
+rd /S /Q %USERPROFILE%\Links 2>nul
+
+echo Searches ...
+rd /S /Q %USERPROFILE%\Searches 2>nul
+
+echo.
echo starting workstation service ...
net start workstation 1>nul 2>nul
net config workstation