From 6876d1c0eff057147aceaa40e9b26f17439eb1ca Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 17 Mar 2019 20:40:25 -0600
Subject: [PATCH] Fixed dict collision in Explorer settings

* Also updated section descriptions
* Addresses issue #60
---
 .bin/Scripts/settings/setup.py | 42 +++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/.bin/Scripts/settings/setup.py b/.bin/Scripts/settings/setup.py
index 8493f6ca..a7797696 100644
--- a/.bin/Scripts/settings/setup.py
+++ b/.bin/Scripts/settings/setup.py
@@ -106,21 +106,34 @@ SETTINGS_EXPLORER_SYSTEM = {
     },
   }
 SETTINGS_EXPLORER_USER = {
-  # Add This PC to Desktop
+  # Desktop icons
   r'Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu': {
-    'DWORD Items': {'{20D04FE0-3AEA-1069-A2D8-08002B30309D}': 0},
+    'DWORD Items': {
+      # This PC
+      '{20D04FE0-3AEA-1069-A2D8-08002B30309D}': 0,
+      # User's Folder
+      '{59031a47-3f72-44a7-89c5-5595fe6b30ee}': 0,
+      },
     },
   r'Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel': {
-    'DWORD Items': {'{20D04FE0-3AEA-1069-A2D8-08002B30309D}': 0},
+    'DWORD Items': {
+      # This PC
+      '{20D04FE0-3AEA-1069-A2D8-08002B30309D}': 0,
+      # User's Folder
+      '{59031a47-3f72-44a7-89c5-5595fe6b30ee}': 0,
+      },
     },
-  # Add Users Files to Desktop
-  r'Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu': {
-    'DWORD Items': {'{59031a47-3f72-44a7-89c5-5595fe6b30ee}': 0},
+  # Disable features
+  r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
+    'DWORD Items': {
+      # Silently installed apps
+      'SilentInstalledAppsEnabled': 0,
+      # Tips and Tricks
+      'SoftLandingEnabled ': 0,
+      'SubscribedContent-338389Enabled': 0,
+      },
     },
-  r'Software\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\NewStartPanel': {
-    'DWORD Items': {'{59031a47-3f72-44a7-89c5-5595fe6b30ee}': 0},
-    },
-  # Explorer
+  # File Explorer
   r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
     'DWORD Items': {
       # Change default Explorer view to "Computer"
@@ -129,15 +142,6 @@ SETTINGS_EXPLORER_USER = {
       'SeparateProcess': 1,
       },
     },
-  r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
-    'DWORD Items': {
-      # Disable silently installed apps
-      'SilentInstalledAppsEnabled': 0,
-      # Disable Tips and Tricks
-      'SoftLandingEnabled ': 0,
-      'SubscribedContent-338389Enabled': 0,
-      },
-    },
   # Hide People bar
   r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People': {
     'DWORD Items': {'PeopleBand': 0},