diff --git a/Autounattend.xml b/Autounattend.template.xml
similarity index 95%
rename from Autounattend.xml
rename to Autounattend.template.xml
index 8bc8c73..dc118f7 100644
--- a/Autounattend.xml
+++ b/Autounattend.template.xml
@@ -143,7 +143,7 @@
             publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS"
             xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <ComputerName>DerGeret</ComputerName>
+            <ComputerName></ComputerName>
             <ProductKey>W269N-WFGWX-YVC9B-4J6C9-T83GX</ProductKey>
         </component>
     </settings>
@@ -188,36 +188,36 @@
             <RegisteredOwner>Admin</RegisteredOwner>
             <DisableAutoDaylightTimeSet>false</DisableAutoDaylightTimeSet>
             <FirstLogonCommands>
-                <SynchronousCommand wcm:action="add">
+                <!-- <SynchronousCommand wcm:action="add">
                     <Description>Control Panel View</Description>
                     <Order>1</Order>
                     <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">
+                </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> -->
                 <SynchronousCommand wcm:action="add">
-                    <Order>3</Order>
+                    <Order>1</Order>
                     <RequiresUserInput>false</RequiresUserInput>
-                    <CommandLine>cmd /C wmic useraccount where name="Admin" set
-                        PasswordExpires=false</CommandLine>
+                    <CommandLine>cmd /C wmic useraccount where name="Admin" set PasswordExpires=false</CommandLine>
                     <Description>Password Never Expires</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
-                    <Order>4</Order>
+                    <Order>2</Order>
                     <RequiresUserInput>false</RequiresUserInput>
                     <CommandLine>powershell -c "Set-ExecutionPolicy -Force Bypass"</CommandLine>
+                    <Description>Allow PowerShell scripts from anywhere.</Description>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
-                    <Order>5</Order>
+                    <Order>3</Order>
                     <RequiresUserInput>false</RequiresUserInput>
                     <CommandLine>powershell -c
                         Set-ExecutionPolicy Bypass -Scope Process -Force;
@@ -230,8 +230,8 @@
                         choco install -y powershell-core --install-arguments='"ADD_FILE_CONTEXT_MENU_RUNPOWERSHELL=1 ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 REGISTER_MANIFEST=1 USE_MU=1 ENABLE_MU=1"';
                         refreshenv;
                         cd $env:USERPROFILE/Documents;
-                        git clone https://git.nuth.ch/manuth/PortValhalla.git;
-                        pwsh PortValhalla/profiles/DerGeret/Restore.ps1;</CommandLine>
+                        git clone https://git.nuth.ch/manuth/PortValhalla.git;</CommandLine>
+                    <Description>Install PowerShell Core and git and run setup</Description>
                 </SynchronousCommand>
             </FirstLogonCommands>
             <TimeZone>W. Europe Standard Time</TimeZone>