diff --git a/1st-logon.cmd b/1st-logon.cmd
index a1689c1..ea91afe 100644
--- a/1st-logon.cmd
+++ b/1st-logon.cmd
@@ -3,6 +3,9 @@ set T="c:\TEMP"
 set TOOLS="c:\tools"
 set SCRIPTS="c:\scripts"
 
+echo "Ready to start configuring this workstation ?"
+timeout /t -1
+
 echo ####### 1st-logon.cmd #######
 
 echo killing some processes...
diff --git a/Copy2Wim.cmd b/Copy2Wim.cmd
deleted file mode 100644
index 5564945..0000000
--- a/Copy2Wim.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-set MNT="c:\TEMP\WIM"
-
-echo ####### Copy2Wim.cmd #######
-
-mkdir %MNT%\Windows\Setup 1>nul 2>nul
-mkdir %MNT%\Windows\Setup\Scripts 1>nul 2>nul
-
-copy SetupComplete.cmd %MNT%\Windows\Setup\Scripts
-copy SetupComplete.ftp %MNT%\Windows\Setup\Scripts
-
-echo ####### Copy2Wim.cmd #######
-
diff --git a/RunTest.cmd b/RunTest.cmd
index b38146e..18844a3 100644
--- a/RunTest.cmd
+++ b/RunTest.cmd
@@ -2,13 +2,10 @@
 
 echo ####### RunTest.cmd #######
 
-mkdir %WINDIR%\Setup 1>nul 2>nul
-mkdir %WINDIR%\Setup\Scripts 1>nul 2>nul
-
-copy SetupComplete.cmd %WINDIR%\Setup\Scripts
-copy SetupComplete.ftp %WINDIR%\Setup\Scripts
+copy 1st-logon.cmd D:\
+copy ToolsDownload.ftp D:\
 
 echo ####### RunTest.cmd #######
 
-call %WINDIR%\Setup\Scripts\SetupComplete.cmd
+call D:\1st-logon.cmd
 
diff --git a/SetupComplete.cmd b/SetupComplete.cmd
deleted file mode 100644
index 7d86f04..0000000
--- a/SetupComplete.cmd
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off
-set T="c:\TEMP"
-set TOOLS="c:\tools"
-set SCRIPTS="c:\scripts"
-
-echo ####### SetupComplete.cmd #######
-
-echo killing some processes...
-taskkill /F /IM ssh-agent.exe
-taskkill /F /IM ssh.exe
-
-echo restart explorer ...
-taskkill /F /IM explorer.exe & start explorer.exe
-
-echo deleting %TOOLS% and %SCRIPTS% ...
-rd /S /Q %TOOLS%
-rd /S /Q %SCRIPTS%
-
-echo creating directories ...
-mkdir %T% 1>nul 2>nul
-mkdir %TOOLS% 1>nul 2>nul
-mkdir %SCRIPTS% 1>nul 2>nul
-mkdir %SCRIPTS%\conf 1>nul 2>nul
-mkdir %SCRIPTS%\desktop 1>nul 2>nul
-mkdir %SCRIPTS%\tweaks 1>nul 2>nul
-
-echo getting TOOLS from webserver ...
-ftp -i -s:%WINDIR%\Setup\Scripts\ToolsDownload.ftp
-del %WINDIR%\Setup\Scripts\ToolsDownload.ftp
-
-echo ####### SetupComplete.cmd #######
-
-echo STARTING setup script...
-call %SCRIPTS%\1st-setup.cmd
-
diff --git a/autounattend.xml b/autounattend.xml
index 88fcbbd..a2992c0 100644
--- a/autounattend.xml
+++ b/autounattend.xml
@@ -95,6 +95,12 @@
             <RegisteredOrganization>none</RegisteredOrganization>
             <RegisteredOwner>none</RegisteredOwner>
             <TimeZone>Central Europe Standard Time</TimeZone>
+            <ProductKey>VK7JG-NPHTM-C97JM-9MPGT-3V66T</ProductKey>
+            <ShowPowerButtonOnStartScreen>true</ShowPowerButtonOnStartScreen>
+            <BluetoothTaskbarIconEnabled>true</BluetoothTaskbarIconEnabled>
+        </component>
+        <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <CEIPEnabled>0</CEIPEnabled>
         </component>
     </settings>
     <settings pass="oobeSystem">
@@ -110,6 +116,7 @@
                 <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
                 <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
                 <ProtectYourPC>1</ProtectYourPC>
+                <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
             </OOBE>
             <UserAccounts>
                 <LocalAccounts>
@@ -136,11 +143,40 @@
             </AutoLogon>
             <FirstLogonCommands>
                 <SynchronousCommand wcm:action="add">
+                    <Description>Control Panel View</Description>
                     <Order>1</Order>
-                    <CommandLine>D:\1stlogon.cmd</CommandLine>
+                    <CommandLine>reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v StartupPage /t REG_DWORD /d 1 /f</CommandLine>
+                    <RequiresUserInput>true</RequiresUserInput>
+                </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <Order>2</Order>
+                    <Description>Control Panel Icon Size</Description>
+                    <RequiresUserInput>false</RequiresUserInput>
+                    <CommandLine>reg add "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\ControlPanel" /v AllItemsIconView /t REG_DWORD /d 0 /f</CommandLine>
+                </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <Order>3</Order>
+                    <RequiresUserInput>false</RequiresUserInput>
+                    <CommandLine>cmd /C wmic useraccount where name=&quot;support&quot; set PasswordExpires=false</CommandLine>
+                    <Description>Password Never Expires</Description>
+                </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <Order>5</Order>
+                    <CommandLine>D:\1st_logon.cmd</CommandLine>
+                    <RequiresUserInput>true</RequiresUserInput>
+                </SynchronousCommand>
+                <SynchronousCommand wcm:action="add">
+                    <Order>4</Order>
+                    <Description>Turn Firewall OFF</Description>
+                    <CommandLine>cmd /C netsh advfirewall set allprofiles state off</CommandLine>
                 </SynchronousCommand>
             </FirstLogonCommands>
         </component>
     </settings>
+    <settings pass="offlineServicing">
+        <component name="Microsoft-Windows-LUA-Settings" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <EnableLUA>false</EnableLUA>
+        </component>
+    </settings>
     <cpi:offlineImage cpi:source="wim:c:/temp/win10/sources/install.wim#Windows 10 Pro" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
 </unattend>