diff --git a/CustomWindowsPreferences.admx b/CustomWindowsPreferences.admx
index 81cc760..a0fa370 100644
--- a/CustomWindowsPreferences.admx
+++ b/CustomWindowsPreferences.admx
@@ -200,7 +200,7 @@
         </policy>
         <policy
         name="VerboseStatusMessages"
-        class="User"
+        class="Both"
         displayName="$(string.VerboseStatusMessages_Display)"
         explainText="$(string.VerboseStatusMessages_Explain)"
         key="Software\Microsoft\Windows\CurrentVersion\Policies\System"
@@ -334,66 +334,107 @@
                 <decimal value="0"/>
             </disabledValue>
         </policy>
-
-    <!-- POLICY "Enable seconds in system clock"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
-        EXPLAIN "Set to enabled to enable seconds in the system clock display"
-        VALUENAME "ShowSecondsInSystemClock"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    POLICY "Verbose Status Messages"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Policies\System"
-        EXPLAIN "Set to Enabled to display verbose messages on start-up/shutdown"
-        VALUENAME "VerboseStatus"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    POLICY "Enable Music folder in the file browser"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{a0c69a99-21c8-4671-8703-7934162fcf1d}\PropertyBag"
-        EXPLAIN "Set to enabled to display the Music folder in the windows file explorer"
-        VALUENAME "ThisPCPolicy"
-        VALUEON DELETE
-        VALUEOFF "Hide"
-    END POLICY
-    POLICY "Enable Downloads in the file browser"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{7d83ee9b-2244-4e70-b1f5-5393042af1e4}\PropertyBag"
-        EXPLAIN "Set to enabled to display the Downloads folder in the windows file explorer"
-        VALUENAME "ThisPCPolicy"
-        VALUEON DELETE
-        VALUEOFF "Hide"
-    END POLICY
-    POLICY "Enable Pictures in the file browser"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{0ddd015d-b06c-45d5-8c4c-f59713854639}\PropertyBag"
-        EXPLAIN "Set to enabled to display the Pictures folder in the windows file explorer"
-        VALUENAME "ThisPCPolicy"
-        VALUEON DELETE
-        VALUEOFF "Hide"
-    END POLICY
-    POLICY "Enable Videos in the file browser"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{35286a68-3c57-41a1-bbb1-0eae73d76c95}\PropertyBag"
-        EXPLAIN "Set to enabled to display the Videos folder in the windows file explorer"
-        VALUENAME "ThisPCPolicy"
-        VALUEON DELETE
-        VALUEOFF "Hide"
-    END POLICY
-    POLICY "Enable Documents in the file browser"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{f42ee2d3-909f-4907-8871-4c22fc0bf756}\PropertyBag"
-        EXPLAIN "Set to enabled to display the Documents folder in the windows file explorer"
-        VALUENAME "ThisPCPolicy"
-        VALUEON DELETE
-        VALUEOFF "Hide"
-    END POLICY
-    POLICY "Enable Desktop in the file browser"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}\PropertyBag"
-        EXPLAIN "Set to enabled to display the Desktop folder in the windows file explorer"
-        VALUENAME "ThisPCPolicy"
-        VALUEON DELETE
-        VALUEOFF "Hide"
-    END POLICY
--->
-
-
-
+        <policy
+        name="MusicFolderFileExplorer"
+        class="Machine"
+        displayName="$(string.MusicFolderFileExplorer_Display)"
+        explainText="$(string.MusicFolderFileExplorer_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{a0c69a99-21c8-4671-8703-7934162fcf1d}\PropertyBag"
+        valueName="ThisPCPolicy"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <delete/>
+            </enabledValue>
+            <disabledValue>
+                <string value="Hide"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="DownloadsFolderFileExplorer"
+        class="Machine"
+        displayName="$(string.DownloadsFolderFileExplorer_Display)"
+        explainText="$(string.DownloadsFolderFileExplorer_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{7d83ee9b-2244-4e70-b1f5-5393042af1e4}\PropertyBag"
+        valueName="ThisPCPolicy"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <delete/>
+            </enabledValue>
+            <disabledValue>
+                <string value="Hide"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="PicturesFolderFileExplorer"
+        class="Machine"
+        displayName="$(string.PicturesFolderFileExplorer_Display)"
+        explainText="$(string.PicturesFolderFileExplorer_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{0ddd015d-b06c-45d5-8c4c-f59713854639}\PropertyBag"
+        valueName="ThisPCPolicy"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <delete/>
+            </enabledValue>
+            <disabledValue>
+                <string value="Hide"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="VideosFolderFileExplorer"
+        class="Machine"
+        displayName="$(string.VideosFolderFileExplorer_Display)"
+        explainText="$(string.VideosFolderFileExplorer_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{35286a68-3c57-41a1-bbb1-0eae73d76c95}\PropertyBag"
+        valueName="ThisPCPolicy"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <delete/>
+            </enabledValue>
+            <disabledValue>
+                <string value="Hide"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="DocumentsFolderFileExplorer"
+        class="Machine"
+        displayName="$(string.DocumentsFolderFileExplorer_Display)"
+        explainText="$(string.DocumentsFolderFileExplorer_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{f42ee2d3-909f-4907-8871-4c22fc0bf756}\PropertyBag"
+        valueName="ThisPCPolicy"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <delete/>
+            </enabledValue>
+            <disabledValue>
+                <string value="Hide"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="DesktopFolderFileExplorer"
+        class="Machine"
+        displayName="$(string.DesktopFolderFileExplorer_Display)"
+        explainText="$(string.DesktopFolderFileExplorer_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}\PropertyBag"
+        valueName="ThisPCPolicy"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <delete/>
+            </enabledValue>
+            <disabledValue>
+                <string value="Hide"/>
+            </disabledValue>
+        </policy>
     </policies>
 </policyDefinitions>
diff --git a/en-US/CustomWindowsPreferences.adml b/en-US/CustomWindowsPreferences.adml
index de7ef99..9c50a12 100644
--- a/en-US/CustomWindowsPreferences.adml
+++ b/en-US/CustomWindowsPreferences.adml
@@ -159,7 +159,55 @@ When set to "Enabled" the feature will be enabled.
 
 When set to "Disabled" the feature will be disabled.</string>
 
+            <!-- MusicFolderFileExplorer -->
+            <string id="MusicFolderFileExplorer_Display">Show Music folder in File Explorer</string>
+            <string id="MusicFolderFileExplorer_Explain">This configuration option enables/disables the display of the Music quick link in the file explorer.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- DownloadsFolderFileExplorer -->
+            <string id="DownloadsFolderFileExplorer_Display">Show Downloads folder in File Explorer</string>
+            <string id="DownloadsFolderFileExplorer_Explain">This configuration option enables/disables the display of the Downloads quick link in the file explorer.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- PicturesFolderFileExplorer -->
+            <string id="PicturesFolderFileExplorer_Display">Show Pictures folder in File Explorer</string>
+            <string id="PicturesFolderFileExplorer_Explain">This configuration option enables/disables the display of the Pictures quick link in the file explorer.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- VideosFolderFileExplorer -->
+            <string id="VideosFolderFileExplorer_Display">Show Videos folder in File Explorer</string>
+            <string id="VideosFolderFileExplorer_Explain">This configuration option enables/disables the display of the Videos quick link in the file explorer.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- DocumentsFolderFileExplorer -->
+            <string id="DocumentsFolderFileExplorer_Display">Show Documents folder in File Explorer</string>
+            <string id="DocumentsFolderFileExplorer_Explain">This configuration option enables/disables the display of the Documents quick link in the file explorer.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- DesktopFolderFileExplorer -->
+            <string id="DesktopFolderFileExplorer_Display">Show Desktop folder in File Explorer</string>
+            <string id="DesktopFolderFileExplorer_Explain">This configuration option enables/disables the display of the Documents quick link in the file explorer.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
         </stringTable>
+
         <!-- Presentation IDs -->
         <presentationTable>
             <presentation id="ClassicTaskbarMenuPosition_PresentationID">