diff --git a/tweaks/disable driver updates/reg/SOFTWARE/disable driver updates.reg b/tweaks/disable driver updates/reg/SOFTWARE/disable driver updates.reg
deleted file mode 100644
index 2e85f58..0000000
Binary files a/tweaks/disable driver updates/reg/SOFTWARE/disable driver updates.reg and /dev/null differ
diff --git a/tweaks/disable fast startup/reg/SYSTEM/disable fast startup.reg b/tweaks/disable fast startup/reg/SYSTEM/disable fast startup.reg
deleted file mode 100644
index 5722dd9..0000000
Binary files a/tweaks/disable fast startup/reg/SYSTEM/disable fast startup.reg and /dev/null differ
diff --git a/tweaks/disable hibernation/reg/SYSTEM/disable hibernation.reg b/tweaks/disable hibernation/reg/SYSTEM/disable hibernation.reg
deleted file mode 100644
index f23b959..0000000
Binary files a/tweaks/disable hibernation/reg/SYSTEM/disable hibernation.reg and /dev/null differ
diff --git a/tweaks/disable metro app caching/SYSTEM/disable metro app caching.reg b/tweaks/disable metro app caching/SYSTEM/disable metro app caching.reg
deleted file mode 100644
index 5e0ed75..0000000
Binary files a/tweaks/disable metro app caching/SYSTEM/disable metro app caching.reg and /dev/null differ
diff --git a/tweaks/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg b/tweaks/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg
deleted file mode 100644
index 0c38ac2..0000000
Binary files a/tweaks/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg and /dev/null differ
diff --git a/tweaks/disable superfetch/reg/SYSTEM/disable superfetch.reg b/tweaks/disable superfetch/reg/SYSTEM/disable superfetch.reg
deleted file mode 100644
index f020d33..0000000
Binary files a/tweaks/disable superfetch/reg/SYSTEM/disable superfetch.reg and /dev/null differ
diff --git a/tweaks/disable telemetry/reg/SOFTWARE/disable telemetry.reg b/tweaks/disable telemetry/reg/SOFTWARE/disable telemetry.reg
deleted file mode 100644
index bfc9062..0000000
Binary files a/tweaks/disable telemetry/reg/SOFTWARE/disable telemetry.reg and /dev/null differ
diff --git a/tweaks/disable windows search/reg/SYSTEM/disable windows search.reg b/tweaks/disable windows search/reg/SYSTEM/disable windows search.reg
deleted file mode 100644
index 4718fab..0000000
Binary files a/tweaks/disable windows search/reg/SYSTEM/disable windows search.reg and /dev/null differ
diff --git a/tweaks/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg b/tweaks/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg
deleted file mode 100644
index 3fea174..0000000
Binary files a/tweaks/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg and /dev/null differ
diff --git a/tweaks/show file extensions/reg/NTUSER/show file extensions.reg b/tweaks/show file extensions/reg/NTUSER/show file extensions.reg
deleted file mode 100644
index 5ca0866..0000000
Binary files a/tweaks/show file extensions/reg/NTUSER/show file extensions.reg and /dev/null differ
diff --git a/tweaks/delay feature updates/reg/SOFTWARE/delay feature updates.reg b/tweaks2/delay feature updates/reg/SOFTWARE/delay feature updates.reg
similarity index 100%
rename from tweaks/delay feature updates/reg/SOFTWARE/delay feature updates.reg
rename to tweaks2/delay feature updates/reg/SOFTWARE/delay feature updates.reg
diff --git a/tweaks/disable activity history/reg/SOFTWARE/disable activity history.reg b/tweaks2/disable activity history/reg/SOFTWARE/disable activity history.reg
similarity index 100%
rename from tweaks/disable activity history/reg/SOFTWARE/disable activity history.reg
rename to tweaks2/disable activity history/reg/SOFTWARE/disable activity history.reg
diff --git a/tweaks/disable ads/reg/NTUSER/disable ads.reg b/tweaks2/disable ads/reg/NTUSER/disable ads.reg
similarity index 100%
rename from tweaks/disable ads/reg/NTUSER/disable ads.reg
rename to tweaks2/disable ads/reg/NTUSER/disable ads.reg
diff --git a/tweaks/disable cortana/reg/SOFTWARE/disable cortana.reg b/tweaks2/disable cortana/reg/SOFTWARE/disable cortana.reg
similarity index 100%
rename from tweaks/disable cortana/reg/SOFTWARE/disable cortana.reg
rename to tweaks2/disable cortana/reg/SOFTWARE/disable cortana.reg
diff --git a/tweaks/disable cross-pc update/reg/SOFTWARE/disable cross-pc update.reg b/tweaks2/disable cross-pc update/reg/SOFTWARE/disable cross-pc update.reg
similarity index 100%
rename from tweaks/disable cross-pc update/reg/SOFTWARE/disable cross-pc update.reg
rename to tweaks2/disable cross-pc update/reg/SOFTWARE/disable cross-pc update.reg
diff --git a/tweaks2/disable driver updates/reg/SOFTWARE/disable driver updates.reg b/tweaks2/disable driver updates/reg/SOFTWARE/disable driver updates.reg
new file mode 100644
index 0000000..0c5d2b8
--- /dev/null
+++ b/tweaks2/disable driver updates/reg/SOFTWARE/disable driver updates.reg	
@@ -0,0 +1,6 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Policies\Microsoft\Windows\WindowsUpdate]
+"ExcludeWUDriversInQualityUpdate"=dword:00000000
+
+
diff --git a/tweaks2/disable fast startup/reg/SYSTEM/disable fast startup.reg b/tweaks2/disable fast startup/reg/SYSTEM/disable fast startup.reg
new file mode 100644
index 0000000..90f5531
--- /dev/null
+++ b/tweaks2/disable fast startup/reg/SYSTEM/disable fast startup.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\ControlSet001\Control\Session Manager\Power]
+"HiberbootEnabled"=dword:00000000
+
diff --git a/tweaks2/disable hibernation/reg/SYSTEM/disable hibernation.reg b/tweaks2/disable hibernation/reg/SYSTEM/disable hibernation.reg
new file mode 100644
index 0000000..f0133a1
--- /dev/null
+++ b/tweaks2/disable hibernation/reg/SYSTEM/disable hibernation.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\ControlSet001\Control\Session Manager\Power]
+"HibernateEnabled"=dword:00000000
+
diff --git a/tweaks2/disable metro app caching/SYSTEM/disable metro app caching.reg b/tweaks2/disable metro app caching/SYSTEM/disable metro app caching.reg
new file mode 100644
index 0000000..e5a4e00
--- /dev/null
+++ b/tweaks2/disable metro app caching/SYSTEM/disable metro app caching.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\ControlSet001\Control\Memory Management]
+"SwapfileControl"=dword:00000000
+
diff --git a/tweaks2/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg b/tweaks2/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg
new file mode 100644
index 0000000..02b9af1
--- /dev/null
+++ b/tweaks2/disable onedrive auto-install/reg/NTUSER/disable onedrive auto-install.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\SOFTWARE\Microsoft\Windows\CurrentVersion\Run]
+"OneDriveSetup"=-
+
diff --git a/tweaks2/disable superfetch/reg/SYSTEM/disable superfetch.reg b/tweaks2/disable superfetch/reg/SYSTEM/disable superfetch.reg
new file mode 100644
index 0000000..a9ca339
--- /dev/null
+++ b/tweaks2/disable superfetch/reg/SYSTEM/disable superfetch.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\ControlSet001\Services\SysMain]
+"Start"=dword:00000004
+
diff --git a/tweaks2/disable telemetry/reg/SOFTWARE/disable telemetry.reg b/tweaks2/disable telemetry/reg/SOFTWARE/disable telemetry.reg
new file mode 100644
index 0000000..355e33a
--- /dev/null
+++ b/tweaks2/disable telemetry/reg/SOFTWARE/disable telemetry.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Policies\Microsoft\Windows\DataCollection]
+"AllowTelemetry"=dword:00000000
+
diff --git a/tweaks/disable windows defender/reg/SOFTWARE/disable windows defender.reg b/tweaks2/disable windows defender/reg/SOFTWARE/disable windows defender.reg
similarity index 100%
rename from tweaks/disable windows defender/reg/SOFTWARE/disable windows defender.reg
rename to tweaks2/disable windows defender/reg/SOFTWARE/disable windows defender.reg
diff --git a/tweaks2/disable windows search/reg/SYSTEM/disable windows search.reg b/tweaks2/disable windows search/reg/SYSTEM/disable windows search.reg
new file mode 100644
index 0000000..7d6210e
--- /dev/null
+++ b/tweaks2/disable windows search/reg/SYSTEM/disable windows search.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\ControlSet001\Services\WSearch]
+"Start"=dword:00000004
+
diff --git a/tweaks/partial unattended setup/iso/autounattend.xml b/tweaks2/partial unattended setup/iso/autounattend.xml
similarity index 100%
rename from tweaks/partial unattended setup/iso/autounattend.xml
rename to tweaks2/partial unattended setup/iso/autounattend.xml
diff --git a/tweaks/post-setup script - disable update reboot/wim/opus-nt-setupcomplete/scripts/disable update reboot.bat b/tweaks2/post-setup script - disable update reboot/wim/opus-nt-setupcomplete/scripts/disable update reboot.bat
similarity index 100%
rename from tweaks/post-setup script - disable update reboot/wim/opus-nt-setupcomplete/scripts/disable update reboot.bat
rename to tweaks2/post-setup script - disable update reboot/wim/opus-nt-setupcomplete/scripts/disable update reboot.bat
diff --git a/tweaks2/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg b/tweaks2/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg
new file mode 100644
index 0000000..8d3dd00
--- /dev/null
+++ b/tweaks2/post-setup script - master/reg/SOFTWARE/autorun post-setup scripts.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Microsoft\Windows\CurrentVersion\RunOnce]
+"opus-nt-setupcomplete"="cmd /c call \"C:\\opus-nt-setupcomplete\\setupcomplete.bat\""
+
diff --git a/tweaks/post-setup script - master/wim/opus-nt-setupcomplete/setupcomplete.bat b/tweaks2/post-setup script - master/wim/opus-nt-setupcomplete/setupcomplete.bat
similarity index 100%
rename from tweaks/post-setup script - master/wim/opus-nt-setupcomplete/setupcomplete.bat
rename to tweaks2/post-setup script - master/wim/opus-nt-setupcomplete/setupcomplete.bat
diff --git a/tweaks2/show file extensions/reg/NTUSER/show file extensions.reg b/tweaks2/show file extensions/reg/NTUSER/show file extensions.reg
new file mode 100644
index 0000000..067da9d
--- /dev/null
+++ b/tweaks2/show file extensions/reg/NTUSER/show file extensions.reg	
@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\OPUS-NT_TMP\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
+"HideFileExt"=dword:00000000
+