diff --git a/CustomWindowsPreferences.admx b/CustomWindowsPreferences.admx
index 9f4fbd8..81cc760 100644
--- a/CustomWindowsPreferences.admx
+++ b/CustomWindowsPreferences.admx
@@ -8,25 +8,20 @@
     <resources minRequiredRevision="1.0"/>
     <supportedOn>
         <definitions>
+            <definition displayName="$(string.SUPPORTED_WIN7_ONLY)" name="SUPPORTED_WIN7_ONLY"/>
             <definition displayName="$(string.SUPPORTED_WIN7_LATER)" name="SUPPORTED_WIN7_LATER"/>
+            <definition displayName="$(string.SUPPORTED_WIN8_ONLY)" name="SUPPORTED_WIN8_ONLY"/>
+            <definition displayName="$(string.SUPPORTED_WIN8_LATER)" name="SUPPORTED_WIN8_LATER"/>
             <definition displayName="$(string.SUPPORTED_WIN10_ONLY)" name="SUPPORTED_WIN10_ONLY"/>
             <definition displayName="$(string.SUPPORTED_WIN10_LATER)" name="SUPPORTED_WIN10_LATER"/>
             <definition displayName="$(string.SUPPORTED_WIN11_ONLY)" name="SUPPORTED_WIN11_ONLY"/>
+            <definition displayName="$(string.SUPPORTED_WIN7-10_ONLY)" name="SUPPORTED_WIN7-10_ONLY"/>
         </definitions>
     </supportedOn>
     <categories>
         <category displayName="$(string.CWP_DisplayName)" name="cwp">
             <parentCategory ref="CWP:Cat_CWP"/>
         </category>
-        <category displayName="$(string.uwo_DisplayName)" name="uwo">
-            <parentCategory ref="cwp"/>
-        </category>
-        <category displayName="$(string.W10_DisplayName)" name="w10">
-            <parentCategory ref="cwp"/>
-        </category>
-        <category displayName="$(string.W11_DisplayName)" name="w11">
-            <parentCategory ref="cwp"/>
-        </category>
     </categories>
     <policies>
         <policy
@@ -37,7 +32,7 @@
         presentation="$(presentation.ClassicTaskbarMenuPosition_PresentationID)"
         key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         >
-            <parentCategory ref="w11"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN11_ONLY"/>
             <elements>
                 <enum id="ClassicTaskbarMenuPosition_Enum" valueName="TaskbarAl">
@@ -62,7 +57,7 @@
         presentation="$(presentation.SearchBoxSize_PresentationID)"
         key="Software\Microsoft\Windows\CurrentVersion\Search"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <elements>
                 <enum id="SearchBoxSize_Enum" valueName="SearchboxTaskbarMode">
@@ -92,7 +87,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer"
         valueName="ShowTaskViewButton"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -109,7 +104,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         valueName="DisablePreviewDesktop"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -126,7 +121,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         valueName="LaunchTo"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -143,7 +138,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer"
         valueName="ShowRecent"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -160,7 +155,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer"
         valueName="ShowFrequent"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -177,7 +172,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer"
         valueName="Start_TrackDocs"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -194,7 +189,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         valueName="DisallowShaking"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN7_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -211,7 +206,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Policies\System"
         valueName="VerboseStatus"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN7_LATER"/>
             <enabledValue>
                 <decimal value="1"/>
@@ -228,7 +223,7 @@
         key="Control Panel\Accessibility\StickyKeys"
         valueName="Flags"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN7_LATER"/>
             <enabledValue>
                 <string value="510"/>
@@ -245,7 +240,7 @@
         key="Control Panel\Accessibility\Keyboard Response"
         valueName="Flags"
         >
-            <parentCategory ref="uwo"/>
+            <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN7_LATER"/>
             <enabledValue>
                 <string value="126"/>
@@ -254,33 +249,151 @@
                 <string value="122"/>
             </disabledValue>
         </policy>
+        <policy
+        name="ItemCheckBoxes"
+        class="User"
+        displayName="$(string.ItemCheckBoxes_Display)"
+        explainText="$(string.ItemCheckBoxes_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        valueName="AutoCheckSelect"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="ItemCheckBoxesDefault"
+        class="Machine"
+        displayName="$(string.ItemCheckBoxesDefault_Display)"
+        explainText="$(string.ItemCheckBoxesDefault_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\Folder\AutoCheckSelect"
+        valueName="DefaultValue"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="SearchBoxSuggestions"
+        class="User"
+        displayName="$(string.SearchBoxSuggestions_Display)"
+        explainText="$(string.SearchBoxSuggestions_Explain)"
+        key="Software\Policies\Microsoft\Windows\Explorer"
+        valueName="DisableSearchBoxSuggestions"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <decimal value="0"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="1"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="BingSearch"
+        class="User"
+        displayName="$(string.BingSearch_Display)"
+        explainText="$(string.BingSearch_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Search"
+        valueName="BingSearchEnabled"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="SecondsInSystemClock"
+        class="Machine"
+        displayName="$(string.SecondsInSystemClock_Display)"
+        explainText="$(string.SecondsInSystemClock_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        valueName="ShowSecondsInSystemClock"
+        >
+            <parentCategory ref="cwp"/>
+            <supportedOn ref="SUPPORTED_WIN7-10_ONLY"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <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
+-->
+
+
 
     </policies>
 </policyDefinitions>
-
-
-<!--
-
-
-    POLICY "Disable Item check boxes"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
-        EXPLAIN "Set to enabled to enable item check boxes"
-        VALUENAME "AutoCheckSelect"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    POLICY "Enable search box suggestions"
-        KEYNAME "Software\Policies\Microsoft\Windows\Explorer"
-        EXPLAIN "Set to enabled to enable search box suggestions"
-        VALUENAME "DisableSearchBoxSuggestions"
-        VALUEON NUMERIC 0
-        VALUEOFF NUMERIC 1
-    END POLICY
-        POLICY "Enable bing search"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Search"
-        EXPLAIN "Set to enabled to enable bing search results from the search bar"
-        VALUENAME "BingSearchEnabled"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
--->
\ No newline at end of file
diff --git a/en-US/CustomWindowsPreferences.adml b/en-US/CustomWindowsPreferences.adml
index 55bdbd3..de7ef99 100644
--- a/en-US/CustomWindowsPreferences.adml
+++ b/en-US/CustomWindowsPreferences.adml
@@ -7,16 +7,17 @@
     <resources>
         <stringTable>
             <!-- Supported Operating Systems -->
+            <string id="SUPPORTED_WIN7_ONLY">Microsoft Windows 7</string>
             <string id="SUPPORTED_WIN7_LATER">Microsoft Windows 7 or later</string>
+            <string id="SUPPORTED_WIN8_ONLY">Microsoft Windows 8</string>
+            <string id="SUPPORTED_WIN8_LATER">Microsoft Windows 8 or later</string>
             <string id="SUPPORTED_WIN10_ONLY">Microsoft Windows 10</string>
             <string id="SUPPORTED_WIN10_LATER">Microsoft Windows 10 or later</string>
             <string id="SUPPORTED_WIN11_ONLY">Microsoft Windows 11</string>
+            <string id="SUPPORTED_WIN7-10_ONLY">Microsoft Windows 7, Microsoft Windows 8, Microsoft Windows 10</string>
 
             <!-- Category Names -->
             <string id="CWP_DisplayName">Custom Windows Preferences</string>
-            <string id="uwo_DisplayName">Universal Windows Preferences</string>
-            <string id="W10_DisplayName">Windows 10 Preferences</string>
-            <string id="W11_DisplayName">Windows 11 Preferences</string>
 
             <!-- ClassicTaskbarMenuPosition -->
             <string id="ClassicTaskbarMenuPosition_Display">Enable Classic Start Button Menu Position</string>
@@ -116,6 +117,46 @@ When set to "Disabled" the feature will be disabled.</string>
 
 When set to "Enabled" the feature will be enabled.
 
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- ItemCheckBoxes -->
+            <string id="ItemCheckBoxes_Display">Item Check Boxes</string>
+            <string id="ItemCheckBoxes_Explain">This configuration option enables/disables item check boxes
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- ItemCheckBoxesDefault -->
+            <string id="ItemCheckBoxesDefault_Display">Item Check Boxes Default Setting</string>
+            <string id="ItemCheckBoxesDefault_Explain">This configuration option enables/disables item check boxes by default.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- SearchBoxSuggestions -->
+            <string id="SearchBoxSuggestions_Display">Search Box Suggestions</string>
+            <string id="SearchBoxSuggestions_Explain">This configuration option enables/disables the auto-suggest for search boxes.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- BingSearch -->
+            <string id="BingSearch_Display">Bing Search</string>
+            <string id="BingSearch_Explain">This configuration option enables/disables the addition of Bing Search results in the search box.
+
+When set to "Enabled" the feature will be enabled.
+
+When set to "Disabled" the feature will be disabled.</string>
+
+            <!-- SecondsInSystemClock -->
+            <string id="SecondsInSystemClock_Display">Show Seconds in System Clock</string>
+            <string id="SecondsInSystemClock_Explain">This configuration option enables/disables the display of seconds in the system clock.
+
+When set to "Enabled" the feature will be enabled.
+
 When set to "Disabled" the feature will be disabled.</string>
 
         </stringTable>