diff --git a/CustomWindowsPreferences.admx b/CustomWindowsPreferences.admx
index 7238a95..5814416 100644
--- a/CustomWindowsPreferences.admx
+++ b/CustomWindowsPreferences.admx
@@ -237,34 +237,50 @@
         class="User"
         displayName="$(string.StickyKeys_Display)"
         explainText="$(string.StickyKeys_Explain)"
+        presentation="$(presentation.StickyKeys_PresentationID)"
         key="Control Panel\Accessibility\StickyKeys"
-        valueName="Flags"
         >
             <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN7_LATER"/>
-            <enabledValue>
-                <string value="510"/>
-            </enabledValue>
-            <disabledValue>
-                <string value="506"/>
-            </disabledValue>
+            <elements>
+                <enum id="StickyKeys_Enum" valueName="Flags">
+                    <item displayName="$(string.StickyKeys_On)">
+                        <value>
+                            <string value="510"/>
+                        </value>
+                    </item>
+                    <item displayName="$(string.StickyKeys_Off)">
+                        <value>
+                            <string value="506"/>
+                        </value>
+                    </item>
+                </enum>
+            </elements>
         </policy>
         <policy
         name="FilterKeys"
         class="User"
         displayName="$(string.FilterKeys_Display)"
         explainText="$(string.FilterKeys_Explain)"
+        presentation="$(presentation.FilterKeys_PresentationID)"
         key="Control Panel\Accessibility\Keyboard Response"
-        valueName="Flags"
         >
             <parentCategory ref="cwp"/>
             <supportedOn ref="SUPPORTED_WIN7_LATER"/>
-            <enabledValue>
-                <string value="126"/>
-            </enabledValue>
-            <disabledValue>
-                <string value="122"/>
-            </disabledValue>
+            <elements>
+                <enum id="FilterKeys_Enum" valueName="Flags">
+                    <item displayName="$(string.FilterKeys_On)">
+                        <value>
+                            <string value="126"/>
+                        </value>
+                    </item>
+                    <item displayName="$(string.FilterKeys_Off)">
+                        <value>
+                            <string value="122"/>
+                        </value>
+                    </item>
+                </enum>
+            </elements>
         </policy>
         <policy
         name="ItemCheckBoxes"
@@ -453,23 +469,5 @@
                 <string value="Hide"/>
             </disabledValue>
         </policy>
-        <policy
-        name="WeatherInTaskbar"
-        class="User"
-        displayName="$(string.WeatherInTaskbar_Display)"
-        explainText="$(string.WeatherInTaskbar_Explain)"
-        key="Software\Microsoft\Windows\CurrentVersion\Feeds"
-        valueName="ShellFeedsTaskbarViewMode"
-        >
-            <parentCategory ref="cwp"/>
-            <supportedOn ref="SUPPORTED_WIN7_LATER"/>
-            <enabledValue>
-                <decimal value="1"/>
-            </enabledValue>
-            <disabledValue>
-                <decimal value="2"/>
-            </disabledValue>
-        </policy>
-
     </policies>
 </policyDefinitions>
diff --git a/en-US/CustomWindowsPreferences.adml b/en-US/CustomWindowsPreferences.adml
index 7b7be34..927fb9f 100644
--- a/en-US/CustomWindowsPreferences.adml
+++ b/en-US/CustomWindowsPreferences.adml
@@ -116,16 +116,21 @@ When set to "Disabled" verbose setatus messages will not be shown.</string>
             <string id="StickyKeys_Display">Sticky Keys</string>
             <string id="StickyKeys_Explain">This configuration option enables/disables the Stickey Keys accessibility feature. Probably best not to turn this off in a real corporate environment.
 
-When set to "Enabled" the feature will be enabled.
+When set to "On" the feature will be enabled.
+
+When set to "Off" the feature will be disabled.</string>
+            <string id="StickyKeys_On">On</string>
+            <string id="StickyKeys_Off">Off</string>
 
-When set to "Disabled" the feature will be disabled.</string>
             <!-- FilterKeys -->
             <string id="FilterKeys_Display">Filter Keys</string>
             <string id="FilterKeys_Explain">This configuration option enables/disables the Filter Keys accessibility feature. Probably best not to turn this off in a real corporate environment.
 
-When set to "Enabled" the feature will be enabled.
+When set to "On" the feature will be enabled.
 
-When set to "Disabled" the feature will be disabled.</string>
+When set to "Off" the feature will be disabled.</string>
+            <string id="FilterKeys_On">On</string>
+            <string id="FilterKeys_Off">Off</string>
 
             <!-- ItemCheckBoxes -->
             <string id="ItemCheckBoxes_Display">Item Check Boxes</string>
@@ -213,14 +218,6 @@ 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>
-
-            <!-- WeatherInTaskbar -->
-            <string id="WeatherInTaskbar_Display">Show Weather in Taskbar</string>
-            <string id="WeatherInTaskbar_Explain">This configuration option enables/disables the display of the weather in the taskbar.
-
-When set to "Enabled" the feature will be enabled.
-
 When set to "Disabled" the feature will be disabled.</string>
         </stringTable>
 
@@ -230,7 +227,13 @@ When set to "Disabled" the feature will be disabled.</string>
                 <dropdownList refId="ClassicTaskbarMenuPosition_Enum" noSort="false">Position</dropdownList>
             </presentation>
             <presentation id="SearchBoxSize_PresentationID">
-                <dropdownList refId="SearchBoxSize_Enum" noSort="false">Position</dropdownList>
+                <dropdownList refId="SearchBoxSize_Enum" noSort="false">Size</dropdownList>
+            </presentation>
+            <presentation id="StickyKeys_PresentationID">
+                <dropdownList refId="StickyKeys_Enum" noSort="false">Mode</dropdownList>
+            </presentation>
+            <presentation id="FilterKeys_PresentationID">
+                <dropdownList refId="FilterKeys_Enum" noSort="false">Mode</dropdownList>
             </presentation>
         </presentationTable>
     </resources>