diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index dd546ed2..f2fee467 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -37,6 +37,13 @@ SETTINGS_EXPLORER_SYSTEM_HW = {
         },
     }
 SETTINGS_EXPLORER_SYSTEM = {
+    # Disable Location Tracking
+    r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
+        'DWORD Items': {'SensorPermissionState': 0},
+        },
+    r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
+        'Status': {'Value': 0},
+        },
     # Disable Telemetry
     r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
         'DWORD Items': {'AllowTelemetry': 0},
@@ -55,31 +62,23 @@ SETTINGS_EXPLORER_SYSTEM = {
     r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': {
         'DWORD Items': {'Value': 0},
         },
-    # Disable Location Tracking
-    r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
-        'DWORD Items': {'SensorPermissionState': 0},
-        },
-    r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
-        'Status': {'Value': 0},
-        },
     # Enable RegBack
     r'System\CurrentControlSet\Control\Session Manager\Configuration Manager': {
         'DWORD Items': {'EnablePeriodicBackup': 1},
         },
     }
 SETTINGS_EXPLORER_USER = {
-    # Disable Cortana
-    r'Software\Microsoft\Personalization\Settings': {
-        'DWORD Items': {'AcceptedPrivacyPolicy': 0},
+    # Disable silently installed apps
+    r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
+        'DWORD Items': {'SilentInstalledAppsEnabled': 0},
         },
-    r'Software\Microsoft\InputPersonalization': {
-        'DWORD Items': {
-            'RestrictImplicitTextCollection': 1,
-            'RestrictImplicitInkCollection': 1
-            },
+    # Disable Tips and Tricks
+    r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
+        'DWORD Items': {'SoftLandingEnabled ': 0},
         },
-    r'Software\Microsoft\InputPersonalization\TrainedDataStore': {
-        'DWORD Items': {'HarvestContacts': 1},
+    # Hide People bar
+    r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People': {
+        'DWORD Items': {'PeopleBand': 0},
         },
     # Hide Search button / box
     r'Software\Microsoft\Windows\CurrentVersion\Search': {