diff --git a/CustomWindowsPreferences.admx b/CustomWindowsPreferences.admx
index 1885a6f..57f5258 100644
--- a/CustomWindowsPreferences.admx
+++ b/CustomWindowsPreferences.admx
@@ -8,9 +8,9 @@
     <resources minRequiredRevision="1.0"/>
     <supportedOn>
         <definitions>
-            <definition displayName="$(string.SUPPORTED_WIN)" name="SUPPORTED_WIN"/>
+            <definition displayName="$(string.SUPPORTED_WIN7)" name="SUPPORTED_WIN7"/>
             <definition displayName="$(string.SUPPORTED_WIN10_ONLY)" name="SUPPORTED_WIN10_ONLY"/>
-            <definition displayName="$(string.SUPPORTED_WIN10_11)" name="SUPPORTED_WIN10_11"/>
+            <definition displayName="$(string.SUPPORTED_WIN10_LATER)" name="SUPPORTED_WIN10_LATER"/>
             <definition displayName="$(string.SUPPORTED_WIN11_ONLY)" name="SUPPORTED_WIN11_ONLY"/>
         </definitions>
     </supportedOn>
@@ -51,11 +51,6 @@
                             <decimal value="1"/>
                         </value>
                     </item>
-                    <item displayName="$(string.ClassicTaskbarMenuPosition_Disabled)">
-                        <value>
-                            <delete/>
-                        </value>
-                    </item>
                 </enum>
             </elements>
         </policy>
@@ -68,7 +63,7 @@
         key="Software\Microsoft\Windows\CurrentVersion\Search"
         >
             <parentCategory ref="uwo"/>
-            <supportedOn ref="SUPPORTED_WIN"/>
+            <supportedOn ref="SUPPORTED_WIN10_LATER"/>
             <elements>
                 <enum id="SearchBoxSize_Enum" valueName="SearchboxTaskbarMode">
                     <item displayName="$(string.SearchBoxSize_Large)">
@@ -86,32 +81,29 @@
                             <decimal value="0"/>
                         </value>
                     </item>
-                    <item displayName="$(string.SearchBoxSize_Disabled)">
-                        <value>
-                            <delete/>
-                        </value>
-                    </item>
                 </enum>
             </elements>
         </policy>
+        <policy
+        name="ShowTaskView"
+        class="User"
+        displayName="$(string.ShowTaskView_Display)"
+        explainText="$(string.ShowTaskView_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer"
+        valueName="ShowTaskViewButton"
+        >
+            <parentCategory ref="uwo"/>
+            <supportedOn ref="SUPPORTED_WIN10_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
 
 
-
-    <!-- POLICY "TaskBar Search Box Size"
-    POLICY "Show all icons in the system tray"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer"
-        EXPLAIN "Set to enabled to show all icons in the system tray"
-        VALUENAME "EnableAutoTray"
-        VALUEON NUMERIC 0
-        VALUEOFF NUMERIC 1
-    END POLICY
-    POLICY "Show Task View button on taskbar"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer"
-        EXPLAIN "Set to enabled to show the Task View Button on the taskbar"
-        VALUENAME "ShowTaskViewButton"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
+    <!--
     POLICY "Disable Desktop Preview"
         KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
         EXPLAIN "Set to enabled to disable the Desktop Preview"
diff --git a/en-US/CustomWindowsPreferences.adml b/en-US/CustomWindowsPreferences.adml
index 3dad358..39a7a12 100644
--- a/en-US/CustomWindowsPreferences.adml
+++ b/en-US/CustomWindowsPreferences.adml
@@ -7,9 +7,9 @@
     <resources>
         <stringTable>
             <!-- Supported Operating Systems -->
-            <string id="SUPPORTED_WIN">Microsoft Windows 7 or later</string>
+            <string id="SUPPORTED_WIN7">Microsoft Windows 7 or later</string>
             <string id="SUPPORTED_WIN10_ONLY">Microsoft Windows 10</string>
-            <string id="SUPPORTED_WIN10_11">Microsoft Windows 10 or later</string>
+            <string id="SUPPORTED_WIN10_LATER">Microsoft Windows 10 or later</string>
             <string id="SUPPORTED_WIN11_ONLY">Microsoft Windows 11</string>
             <!-- Category Names -->
             <string id="CWP_DisplayName">Custom Windows Preferences</string>
@@ -22,25 +22,26 @@
 
 When set to "Left" the start button and other icons will be moved to the left of the screen like traditional windows environments.
 
-When set to "Center" the start menu and icons will be centered in the screen.
-
-When set to "Disabled" the user is allowed to choose the start button placement.</string>
+When set to "Center" the start menu and icons will be centered in the screen.</string>
             <string id="ClassicTaskbarMenuPosition_Left">Left</string>
             <string id="ClassicTaskbarMenuPosition_Center">Center</string>
-            <string id="ClassicTaskbarMenuPosition_Disabled">Disabled</string>
             <!-- SearchBoxSize -->
             <string id="SearchBoxSize_Display">Taskbar Searchbox Size/Visability</string>
             <string id="SearchBoxSize_Explain">This configuration option determines the size/visability of the search icon on the taskbar.
 
 When set to "Small" or "Large" the search icon is displayed on the taskbar.
 
-When set to "Hidden" the search icon is not displayed on the taskbar.
-
-When set to "Disabled" the user is allowed to choose the search size/visability.</string>
+When set to "Hidden" the search icon is not displayed on the taskbar.</string>
             <string id="SearchBoxSize_Large">Large</string>
             <string id="SearchBoxSize_Small">Small</string>
             <string id="SearchBoxSize_Hidden">Hidden</string>
-            <string id="SearchBoxSize_Disabled">Disabled</string>
+            <!-- ShowTaskView -->
+            <string id="ShowTaskView_Display">Taskview Visability</string>
+            <string id="ShowTaskView_Explain">This configuration options determines the visibility of the Taskview button on the taskbar.
+
+When set to "Enabled" the Taskview button is displayed on the taskbar.
+
+When set to "Disabled" the Taskview button is not displayed on the taskbar.</string>
         </stringTable>
         <!-- Presentation IDs -->
         <presentationTable>