diff --git a/06_Copy2Stick.cmd b/06_Copy2Stick.cmd
index 7ba894f..905f0ba 100644
--- a/06_Copy2Stick.cmd
+++ b/06_Copy2Stick.cmd
@@ -13,6 +13,13 @@ echo =====================
set USBDRIVE=%1
+if EXIST settings.cmd (
+ call settings.cmd
+) else (
+ set LANG=en-US
+)
+echo LANG=%LANG%
+
if /I %USBDRIVE% == C: (
echo ERROR: cannot use drive %USBDRIVE% !
exit /b
@@ -68,6 +75,7 @@ echo.
tools\searchreplace %USBDRIVE%\autounattend.xml ___MYUSER___ "%MYUSER%"
tools\searchreplace %USBDRIVE%\autounattend.xml ___MYNAME___ "%MYNAME%"
tools\searchreplace %USBDRIVE%\autounattend.xml ___MYPASS___ "%MYPASS%"
+tools\searchreplace %USBDRIVE%\autounattend.xml ___MYLANG___ "%LANG%"
echo.
echo copying [ %BOOT% ] to drive %USBDRIVE% ...
diff --git a/boot/autounattend_BIOS_template.xml b/boot/autounattend_BIOS_template.xml
index e0f8521..e1d143c 100644
--- a/boot/autounattend_BIOS_template.xml
+++ b/boot/autounattend_BIOS_template.xml
@@ -6,10 +6,10 @@
en-US
- de-DE
- de-DE
+ ___MYLANG___
+ ___MYLANG___
en-US
- de-DE
+ ___MYLANG___
@@ -84,10 +84,10 @@
- de-DE
- de-DE
+ ___MYLANG___
+ ___MYLANG___
en-US
- de-DE
+ ___MYLANG___
@@ -101,11 +101,9 @@
-
___MYPASS___
<![CDATA[true</PlainText>
</Password>
- <!-- USERNAME HERE -->
<DisplayName>___MYNAME___</DisplayName>
<Name>___MYUSER___</Name>
<Group>Administrators</Group>
@@ -114,13 +112,11 @@
</UserAccounts>
<AutoLogon>
<Password>
- <!-- PASSWORD HERE -->
<Value>___MYPASS___</Value>
<PlainText>true</PlainText>
</Password>
<Enabled>true</Enabled>
<LogonCount>1</LogonCount>
- <!-- USERNAME HERE -->
<Username>___MYUSER___</Username>
</AutoLogon>
<FirstLogonCommands>
diff --git a/boot/autounattend_UEFI_template.xml b/boot/autounattend_UEFI_template.xml
index 1071b2e..d45bd92 100644
--- a/boot/autounattend_UEFI_template.xml
+++ b/boot/autounattend_UEFI_template.xml
@@ -6,10 +6,10 @@
<SetupUILanguage>
<UILanguage>en-US</UILanguage>
</SetupUILanguage>
- <InputLocale>de-DE</InputLocale>
- <SystemLocale>de-DE</SystemLocale>
+ <InputLocale>___MYLANG___</InputLocale>
+ <SystemLocale>___MYLANG___</SystemLocale>
<UILanguage>en-US</UILanguage>
- <UserLocale>de-DE</UserLocale>
+ <UserLocale>___MYLANG___</UserLocale>
</component>
<component name="Microsoft-Windows-Setup" 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">
<DiskConfiguration>
@@ -104,10 +104,10 @@
</settings>
<settings pass="oobeSystem">
<component name="Microsoft-Windows-International-Core" 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">
- <InputLocale>de-DE</InputLocale>
- <SystemLocale>de-DE</SystemLocale>
+ <InputLocale>___MYLANG___</InputLocale>
+ <SystemLocale>___MYLANG___</SystemLocale>
<UILanguage>en-US</UILanguage>
- <UserLocale>de-DE</UserLocale>
+ <UserLocale>___MYLANG___</UserLocale>
</component>
<component name="Microsoft-Windows-Shell-Setup" 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">
<OOBE>
@@ -121,12 +121,10 @@
<LocalAccounts>
<LocalAccount wcm:action="add">
<Password>
- <!-- PASSWORD HERE -->
<Value>___MYPASS___</Value>
<PlainText>true</PlainText>
</Password>
<DisplayName>___MYNAME___</DisplayName>
- <!-- USERNAME HERE -->
<Name>___MYUSER___</Name>
<Group>Administrators</Group>
</LocalAccount>
@@ -134,13 +132,11 @@
</UserAccounts>
<AutoLogon>
<Password>
- <!-- PASSWORD HERE -->
<Value>___MYPASS___</Value>
<PlainText>true</PlainText>
</Password>
<Enabled>true</Enabled>
<LogonCount>1</LogonCount>
- <!-- USERNAME HERE -->
<Username>___MYUSER___</Username>
</AutoLogon>
<FirstLogonCommands>
diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index 0f5d248..f67d0cd 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -78,8 +78,8 @@ echo.
call modify-path.cmd
echo.
-rem call modify-explorer.cmd
-rem echo.
+call modify-explorer.cmd
+echo.
call modify-powersettings.cmd
echo.
diff --git a/scripts/modify-explorer.cmd b/scripts/modify-explorer.cmd
index be13863..3cecb12 100644
--- a/scripts/modify-explorer.cmd
+++ b/scripts/modify-explorer.cmd
@@ -2,6 +2,10 @@
echo ####### %0 #######
+echo disabling quick access ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer" ^
+ /v "HubMode" /t REG_DWORD /d 1 /f 1>nul
+
echo disabling 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
@@ -15,3 +19,4 @@ taskkill /f /im explorer.exe 1>nul 2>nul
start explorer.exe
echo ####### %0 #######
+
diff --git a/wim/settings.cmd b/settings.cmd
similarity index 100%
rename from wim/settings.cmd
rename to settings.cmd
diff --git a/tools/logon.cmd b/tools/logon.cmd
index b6b74cc..c36ba3d 100644
--- a/tools/logon.cmd
+++ b/tools/logon.cmd
@@ -137,6 +137,25 @@ rem config must be full qualified pathname (OpenShell BUG!)
set CONFIG=%TOOLS%\scripts\config\OpenshellSettings.xml
"%ProgramFiles%"\Open-Shell\StartMenu.exe -xml %CONFIG%
+echo removing user folders from explorer navigation pane ...
+for %%K in (
+ {0DB7E03F-FC29-4DC6-9020-FF41B59E513A}
+ {B4BFCC3A-DB2C-424C-B029-7FE99A87C641}
+ {D3162B92-9365-467A-956B-92703ACA08AF}
+ {088E3905-0323-4B02-9826-5D99428E115F}
+ {3DFDF296-DBEC-4FB4-81D1-6A3438BCF4DE}
+ {24AD3AD4-A569-4530-98E1-AB02F9417AA8}
+ {F86FA3AB-70D2-4FC7-9C99-FCBF05467F3A}
+) do (
+ echo %%K
+ reg add "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideMyComputerIcons" ^
+ /v "%%K" /t REG_DWORD /d 1 /f 1>nul
+)
+
+echo adding home folder to explorer navigation pane ...
+reg add "HKEY_CURRENT_USER\Software\Classes\CLSID\{59031a47-3f72-44a7-89c5-5595fe6b30ee}" ^
+ /v "System.IsPinnedToNameSpaceTree" /t REG_DWORD /d 1 /f 1>nul
+
echo restarting explorer ...
taskkill /f /im explorer.exe 2>nul
rem sleep 2 seconds ...
diff --git a/wim/finish-boot.cmd b/wim/finish-boot.cmd
index 8c1fc43..93ca410 100644
--- a/wim/finish-boot.cmd
+++ b/wim/finish-boot.cmd
@@ -2,8 +2,8 @@
set SOURCES=c:\TEMP\W10\sources
set BOOT=c:\TEMP\BOOT
-if EXIST settings.cmd (
- call settings.cmd
+if EXIST ..\settings.cmd (
+ call ..\settings.cmd
) else (
set LANG=en-US
)
]]></plaintext></password></localaccount></localaccounts></oobe></component></settings></diskconfiguration></component></span>