From dfc57d861b0df99bac545f123c176cd190cf9dd8 Mon Sep 17 00:00:00 2001
From: Chris Titus <contact@christitus.com>
Date: Tue, 19 Dec 2023 14:10:35 -0600
Subject: [PATCH] Bring in old commits

---
 config/tweaks.json | 71 ++++++++++++++++++++++++++++++----------------
 winutil.ps1        | 71 ++++++++++++++++++++++++++++++----------------
 2 files changed, 94 insertions(+), 48 deletions(-)

diff --git a/config/tweaks.json b/config/tweaks.json
index 60e19fd2..a61597c4 100644
--- a/config/tweaks.json
+++ b/config/tweaks.json
@@ -179,12 +179,12 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "BcastDVRUserService_dc2a4",
+        "Name": "BcastDVRUserService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
       {
-        "Name": "BluetoothUserService_dc2a4",
+        "Name": "BluetoothUserService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -214,7 +214,7 @@
         "OriginalType": "Automatic"
       },
       {
-        "Name": "CDPUserSvc_dc2a4",
+        "Name": "CDPUserSvc_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
@@ -224,7 +224,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "CaptureService_dc2a4",
+        "Name": "CaptureService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -239,7 +239,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "ConsentUxUserSvc_dc2a4",
+        "Name": "ConsentUxUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -249,7 +249,7 @@
         "OriginalType": "Automatic"
       },
       {
-        "Name": "CredentialEnrollmentManagerUserSvc_dc2a4",
+        "Name": "CredentialEnrollmentManagerUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -284,7 +284,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "DeviceAssociationBrokerSvc_dc2a4",
+        "Name": "DeviceAssociationBrokerSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -299,12 +299,12 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "DevicePickerUserSvc_dc2a4",
+        "Name": "DevicePickerUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
       {
-        "Name": "DevicesFlowUserSvc_dc2a4",
+        "Name": "DevicesFlowUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -514,7 +514,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "MessagingService_dc2a4",
+        "Name": "MessagingService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -539,7 +539,7 @@
         "OriginalType": "Disabled"
       },
       {
-        "Name": "NPSMSvc_dc2a4",
+        "Name": "NPSMSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -575,8 +575,8 @@
       },
       {
         "Name": "Netlogon",
-        "StartupType": "Manual",
-        "OriginalType": "Manual"
+        "StartupType": "Automatic",
+        "OriginalType": "Automatic"
       },
       {
         "Name": "Netman",
@@ -599,12 +599,12 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "OneSyncSvc_dc2a4",
+        "Name": "OneSyncSvc_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
       {
-        "Name": "P9RdrService_dc2a4",
+        "Name": "P9RdrService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -629,7 +629,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "PenService_dc2a4",
+        "Name": "PenService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -644,7 +644,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "PimIndexMaintenanceSvc_dc2a4",
+        "Name": "PimIndexMaintenanceSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -669,7 +669,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "PrintWorkflowUserSvc_dc2a4",
+        "Name": "PrintWorkflowUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -944,7 +944,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "UdkUserSvc_dc2a4",
+        "Name": "UdkUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -959,12 +959,12 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "UnistoreSvc_dc2a4",
+        "Name": "UnistoreSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
       {
-        "Name": "UserDataSvc_dc2a4",
+        "Name": "UserDataSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -1144,7 +1144,7 @@
         "OriginalType": "Automatic"
       },
       {
-        "Name": "WpnUserService_dc2a4",
+        "Name": "WpnUserService_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
@@ -1189,7 +1189,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "cbdhsvc_dc2a4",
+        "Name": "cbdhsvc_*",
         "StartupType": "Manual",
         "OriginalType": "Automatic"
       },
@@ -1459,7 +1459,7 @@
         "OriginalType": "Manual"
       },
       {
-        "Name": "webthreatdefusersvc_dc2a4",
+        "Name": "webthreatdefusersvc_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
@@ -1876,6 +1876,12 @@
         }
         Remove-Item -Path \"HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\NameSpace\\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}\" -Recurse -ErrorAction SilentlyContinue
 
+        # Fix Managed by your organization in Edge if regustry path exists then remove it
+
+        If (Test-Path \"HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge\") {
+            Remove-Item -Path \"HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge\" -Recurse -ErrorAction SilentlyContinue
+        }
+
         # Group svchost.exe processes
         $ram = (Get-CimInstance -ClassName Win32_PhysicalMemory | Measure-Object -Property Capacity -Sum).Sum / 1kb
         Set-ItemProperty -Path \"HKLM:\\SYSTEM\\CurrentControlSet\\Control\" -Name \"SvcHostSplitThresholdInKB\" -Type DWord -Value $ram -Force
@@ -2346,6 +2352,23 @@
       }
     ]
   },
+  "WPFEssTweaksTeredo": {
+    "registry": [
+      {
+        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
+        "Name": "DisabledComponents",
+        "Value": "1",
+        "OriginalValue": "0",
+        "Type": "DWord"
+      }
+    ],
+    "InvokeScript": [
+      "netsh interface teredo set state disabled"
+    ],
+    "UndoScript": [
+      "netsh interface teredo set state default"
+    ]
+  },
   "WPFBingSearch": {
     "registry": [
       {
diff --git a/winutil.ps1 b/winutil.ps1
index 96c39914..b072b284 100644
--- a/winutil.ps1
+++ b/winutil.ps1
@@ -6335,12 +6335,12 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "BcastDVRUserService_dc2a4",
+        "Name": "BcastDVRUserService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
       {
-        "Name": "BluetoothUserService_dc2a4",
+        "Name": "BluetoothUserService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6370,7 +6370,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Automatic"
       },
       {
-        "Name": "CDPUserSvc_dc2a4",
+        "Name": "CDPUserSvc_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
@@ -6380,7 +6380,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "CaptureService_dc2a4",
+        "Name": "CaptureService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6395,7 +6395,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "ConsentUxUserSvc_dc2a4",
+        "Name": "ConsentUxUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6405,7 +6405,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Automatic"
       },
       {
-        "Name": "CredentialEnrollmentManagerUserSvc_dc2a4",
+        "Name": "CredentialEnrollmentManagerUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6440,7 +6440,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "DeviceAssociationBrokerSvc_dc2a4",
+        "Name": "DeviceAssociationBrokerSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6455,12 +6455,12 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "DevicePickerUserSvc_dc2a4",
+        "Name": "DevicePickerUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
       {
-        "Name": "DevicesFlowUserSvc_dc2a4",
+        "Name": "DevicesFlowUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6670,7 +6670,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "MessagingService_dc2a4",
+        "Name": "MessagingService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6695,7 +6695,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Disabled"
       },
       {
-        "Name": "NPSMSvc_dc2a4",
+        "Name": "NPSMSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6731,8 +6731,8 @@ $sync.configs.tweaks = '{
       },
       {
         "Name": "Netlogon",
-        "StartupType": "Manual",
-        "OriginalType": "Manual"
+        "StartupType": "Automatic",
+        "OriginalType": "Automatic"
       },
       {
         "Name": "Netman",
@@ -6755,12 +6755,12 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "OneSyncSvc_dc2a4",
+        "Name": "OneSyncSvc_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
       {
-        "Name": "P9RdrService_dc2a4",
+        "Name": "P9RdrService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6785,7 +6785,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "PenService_dc2a4",
+        "Name": "PenService_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6800,7 +6800,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "PimIndexMaintenanceSvc_dc2a4",
+        "Name": "PimIndexMaintenanceSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -6825,7 +6825,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "PrintWorkflowUserSvc_dc2a4",
+        "Name": "PrintWorkflowUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -7100,7 +7100,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "UdkUserSvc_dc2a4",
+        "Name": "UdkUserSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -7115,12 +7115,12 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "UnistoreSvc_dc2a4",
+        "Name": "UnistoreSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
       {
-        "Name": "UserDataSvc_dc2a4",
+        "Name": "UserDataSvc_*",
         "StartupType": "Manual",
         "OriginalType": "Manual"
       },
@@ -7300,7 +7300,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Automatic"
       },
       {
-        "Name": "WpnUserService_dc2a4",
+        "Name": "WpnUserService_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
@@ -7345,7 +7345,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "cbdhsvc_dc2a4",
+        "Name": "cbdhsvc_*",
         "StartupType": "Manual",
         "OriginalType": "Automatic"
       },
@@ -7615,7 +7615,7 @@ $sync.configs.tweaks = '{
         "OriginalType": "Manual"
       },
       {
-        "Name": "webthreatdefusersvc_dc2a4",
+        "Name": "webthreatdefusersvc_*",
         "StartupType": "Automatic",
         "OriginalType": "Automatic"
       },
@@ -8032,6 +8032,12 @@ $sync.configs.tweaks = '{
         }
         Remove-Item -Path \"HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\MyComputer\\NameSpace\\{0DB7E03F-FC29-4DC6-9020-FF41B59E513A}\" -Recurse -ErrorAction SilentlyContinue
 
+        # Fix Managed by your organization in Edge if regustry path exists then remove it
+
+        If (Test-Path \"HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge\") {
+            Remove-Item -Path \"HKLM:\\SOFTWARE\\Policies\\Microsoft\\Edge\" -Recurse -ErrorAction SilentlyContinue
+        }
+
         # Group svchost.exe processes
         $ram = (Get-CimInstance -ClassName Win32_PhysicalMemory | Measure-Object -Property Capacity -Sum).Sum / 1kb
         Set-ItemProperty -Path \"HKLM:\\SYSTEM\\CurrentControlSet\\Control\" -Name \"SvcHostSplitThresholdInKB\" -Type DWord -Value $ram -Force
@@ -8502,6 +8508,23 @@ $sync.configs.tweaks = '{
       }
     ]
   },
+  "WPFEssTweaksTeredo": {
+    "registry": [
+      {
+        "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\Tcpip6\\Parameters",
+        "Name": "DisabledComponents",
+        "Value": "1",
+        "OriginalValue": "0",
+        "Type": "DWord"
+      }
+    ],
+    "InvokeScript": [
+      "netsh interface teredo set state disabled"
+    ],
+    "UndoScript": [
+      "netsh interface teredo set state default"
+    ]
+  },
   "WPFBingSearch": {
     "registry": [
       {