diff --git a/0.1_CreateDefaultAssociations.bat b/0.1_CreateDefaultAssociations.bat
index 999d4a55c2982df512b786cfc76cc425bf52973e..f8acc7a590c2d7a392d1f67d07f2df6671d1aad8 100644
--- a/0.1_CreateDefaultAssociations.bat
+++ b/0.1_CreateDefaultAssociations.bat
@@ -1 +1 @@
-dism /Online /Export-DefaultAppAssociations:c:\defaultassociations.xml
\ No newline at end of file
+dism /Online /Export-DefaultAppAssociations:C:\DefaultAssociations.xml
\ No newline at end of file
diff --git a/1_Preperations.bat b/1_Preperations.bat
index 2e94461f5d1a4d2850cfb2095b664cc40d8af82e..04f214b71feea5ea0a260fbfb2f5a35a8693c1f1 100644
--- a/1_Preperations.bat
+++ b/1_Preperations.bat
@@ -2,12 +2,12 @@
 pushd %~dp0
 robocopy "ScriptFiles" "%localappdata%\Microsoft\Windows\Shell" "LayoutModification.xml"
 robocopy "ScriptFiles" "C:\Install" "unattend.xml"
-robocopy "ScriptFiles" "C:\ProgramData\Install" "defaultassociations.xml"
+robocopy "ScriptFiles" "C:\ProgramData\Install" "DefaultAssociations.xml"
 
-reg import "ScriptFiles\Deactivate Aero Shake.reg"
+reg import "ScriptFiles\Deactivate AeroShake.reg"
 reg import "ScriptFiles\Deactivate Start Menu Web Search.reg"
 reg import "ScriptFiles\Deactivate News & Meet.reg"
-reg import "ScriptFiles\Set default apps.reg"
+reg import "ScriptFiles\Set Default Apps.reg"
 
 popd
 pause
diff --git a/ScriptFiles/Deactivate Aero Shake.reg b/ScriptFiles/Deactivate Aero Shake.reg
deleted file mode 100644
index e73cf22371ad74299c1e979cfeaaa318efbfcb8b..0000000000000000000000000000000000000000
Binary files a/ScriptFiles/Deactivate Aero Shake.reg and /dev/null differ
diff --git a/ScriptFiles/Deactivate AeroShake.reg b/ScriptFiles/Deactivate AeroShake.reg
new file mode 100644
index 0000000000000000000000000000000000000000..f9a1284deb02a108e3c65e7b4298b82d50f06733
--- /dev/null
+++ b/ScriptFiles/Deactivate AeroShake.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Explorer]
+"NoWindowMinimizingShortcuts"=dword:00000001
+
diff --git a/ScriptFiles/Deactivate News & Meet.reg b/ScriptFiles/Deactivate News & Meet.reg
index 85b88ffd9fc2588aed72fa783012e393b0ef3fb1..aef14f8b809f646ee75bf891b8b0d2fc717f20a6 100644
Binary files a/ScriptFiles/Deactivate News & Meet.reg and b/ScriptFiles/Deactivate News & Meet.reg differ
diff --git a/ScriptFiles/Deactivate Start Menu Web Search.reg b/ScriptFiles/Deactivate Start Menu Web Search.reg
index aa4df64bf7535d223d7543a70c8e6f9929a3d216..053ca5171b51100c484b13ccb140a4b7bfab99b4 100644
Binary files a/ScriptFiles/Deactivate Start Menu Web Search.reg and b/ScriptFiles/Deactivate Start Menu Web Search.reg differ
diff --git a/ScriptFiles/defaultassociations.xml b/ScriptFiles/DefaultAssociations.xml
similarity index 98%
rename from ScriptFiles/defaultassociations.xml
rename to ScriptFiles/DefaultAssociations.xml
index 6949f6ba24e146da2ffdd5acd060e04c3dd768d4..bd3b1a19d937acefd131947ae867d78e3e1a66d0 100644
--- a/ScriptFiles/defaultassociations.xml
+++ b/ScriptFiles/DefaultAssociations.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<DefaultAssociations>
-  <Association Identifier=".htm" ProgId="FirefoxHTML-308046B0AF4A39CB" ApplicationName="Firefox" />
-  <Association Identifier=".html" ProgId="FirefoxHTML-308046B0AF4A39CB" ApplicationName="Firefox" />
-  <Association Identifier=".pdf" ProgId="AcroExch.Document.DC" ApplicationName="Adobe Acrobat Reader DC" />
-  <Association Identifier="http" ProgId="FirefoxURL-308046B0AF4A39CB" ApplicationName="Firefox" />
-  <Association Identifier="https" ProgId="FirefoxURL-308046B0AF4A39CB" ApplicationName="Firefox" />
-  <Association Identifier="mailto" ProgId="Outlook.URL.mailto.15" ApplicationName="Outlook" />
-  <Association Identifier="microsoft-edge" ProgId="EdgeDeflector.microsoft-edge" ApplicationName="EdgeDeflector" />
+<?xml version="1.0" encoding="UTF-8"?>
+<DefaultAssociations>
+  <Association Identifier=".htm" ProgId="FirefoxHTML-308046B0AF4A39CB" ApplicationName="Firefox" />
+  <Association Identifier=".html" ProgId="FirefoxHTML-308046B0AF4A39CB" ApplicationName="Firefox" />
+  <Association Identifier=".pdf" ProgId="AcroExch.Document.DC" ApplicationName="Adobe Acrobat Reader DC" />
+  <Association Identifier="http" ProgId="FirefoxURL-308046B0AF4A39CB" ApplicationName="Firefox" />
+  <Association Identifier="https" ProgId="FirefoxURL-308046B0AF4A39CB" ApplicationName="Firefox" />
+  <Association Identifier="mailto" ProgId="Outlook.URL.mailto.15" ApplicationName="Outlook" />
+  <Association Identifier="microsoft-edge" ProgId="EdgeDeflector.microsoft-edge" ApplicationName="EdgeDeflector" />
 </DefaultAssociations>
\ No newline at end of file
diff --git a/ScriptFiles/Set Default Apps.reg b/ScriptFiles/Set Default Apps.reg
new file mode 100644
index 0000000000000000000000000000000000000000..05700e36e37433fc831e9cbc0ccc94fcf174b25a
--- /dev/null
+++ b/ScriptFiles/Set Default Apps.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\System]
+"DefaultAssociationsConfiguration"="C:\\ProgramData\\Install\\DefaultAssociations.xml"
+
diff --git a/ScriptFiles/Set default apps.reg b/ScriptFiles/Set default apps.reg
deleted file mode 100644
index 8cea207f386689c3b933d35757b1c81d17c03d72..0000000000000000000000000000000000000000
Binary files a/ScriptFiles/Set default apps.reg and /dev/null differ