diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd
index 1574638..372038d 100644
--- a/optional/install-totalcommander.cmd
+++ b/optional/install-totalcommander.cmd
@@ -3,7 +3,7 @@ call check-for-admin
 if %ERRORLEVEL% neq 0 exit /b
 
 set EXE=..\software\totalcommander-setup.exe
-set KEY=..\software\wincmd.key
+set KEY=..\custom\wincmd.key
 set TARGET=c:\totalcmd
 set STARTMENU=%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs
 set STARTMENU_USER=%APPDATA%\Microsoft\Windows\Start Menu\Programs
diff --git a/tools/setup-servermode.cmd b/tools/setup-servermode.cmd
index 1dfc507..8d233c3 100644
--- a/tools/setup-servermode.cmd
+++ b/tools/setup-servermode.cmd
@@ -5,19 +5,29 @@ echo ####### %0 #######
 
 echo Disabling Lockscreen function ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
-  /v DisableLockWorkstation /t REG_DWORD /d "1" /f 2>/nul
+  /v DisableLockWorkstation /t REG_DWORD /d "1" /f 2>nul
 
 echo Disabling fast User switching ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" ^
-  /v HideFastUserSwitching /t REG_DWORD /d "1" /f 2>/nul
+  /v HideFastUserSwitching /t REG_DWORD /d "1" /f 2>nul
 
 echo Disabling Startmenu power button ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" ^
-  /v StartMenuLogoff /t REG_DWORD /d "0" /f 2>/nul
+  /v StartMenuLogoff /t REG_DWORD /d "0" /f 2>nul
+
+echo Disabling Startmenu sleep button ...
+reg add "HKLM\SOFTWARE\Microsoft\PolicyManager\current\device\Start" ^
+  /v "HideSleep" /t REG_DWORD /d 1 /f 2>nul
+
+reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\System" ^
+  /v "ShowSleepOption" /t REG_DWORD /d "0" /f 2>nul
+
+reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\FlyoutMenuSettings" ^
+/v "ShowSleepOption" /t REG_DWORD /d "0" /f 2>nul
 
 echo Disabling Power options ...
 reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" ^
-  /v shutdownwithoutlogon /t REG_DWORD /d "0" /f 2>/nul
+  /v shutdownwithoutlogon /t REG_DWORD /d "0" /f 2>nul
 
 reg add "HKLM\SOFTWARE\Microsoft\PolicyManager\default\Start\HideShutDown" ^
   /v "value" /t REG_DWORD /d 1 /f 2>nul