diff --git a/CustomWindowsPreferences.admx b/CustomWindowsPreferences.admx
index 5814416..8c4150c 100644
--- a/CustomWindowsPreferences.admx
+++ b/CustomWindowsPreferences.admx
@@ -237,50 +237,34 @@
         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"/>
-            <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>
+            <enabledValue>
+                <string>510</string>
+            </enabledValue>
+            <disabledValue>
+                <string>506</string>
+            </disabledValue>
         </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"/>
-            <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>
+            <enabledValue>
+                <string>126</string>
+            </enabledValue>
+            <disabledValue>
+                <string>122</string>
+            </disabledValue>
         </policy>
         <policy
         name="ItemCheckBoxes"
@@ -381,7 +365,7 @@
                 <delete/>
             </enabledValue>
             <disabledValue>
-                <string value="Hide"/>
+                <string>Hide</string>
             </disabledValue>
         </policy>
         <policy
@@ -398,7 +382,7 @@
                 <delete/>
             </enabledValue>
             <disabledValue>
-                <string value="Hide"/>
+                <string>Hide</string>
             </disabledValue>
         </policy>
         <policy
@@ -415,7 +399,7 @@
                 <delete/>
             </enabledValue>
             <disabledValue>
-                <string value="Hide"/>
+                <string>Hide</string>
             </disabledValue>
         </policy>
         <policy
@@ -432,7 +416,7 @@
                 <delete/>
             </enabledValue>
             <disabledValue>
-                <string value="Hide"/>
+                <string>Hide</string>
             </disabledValue>
         </policy>
         <policy
@@ -449,7 +433,7 @@
                 <delete/>
             </enabledValue>
             <disabledValue>
-                <string value="Hide"/>
+                <string>Hide</string>
             </disabledValue>
         </policy>
         <policy
diff --git a/en-US/CustomWindowsPreferences.adml b/en-US/CustomWindowsPreferences.adml
index 927fb9f..34d216c 100644
--- a/en-US/CustomWindowsPreferences.adml
+++ b/en-US/CustomWindowsPreferences.adml
@@ -119,8 +119,6 @@ When set to "Disabled" verbose setatus messages will not be shown.</string>
 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>
 
             <!-- FilterKeys -->
             <string id="FilterKeys_Display">Filter Keys</string>
@@ -129,8 +127,6 @@ When set to "Off" the feature will be disabled.</string>
 When set to "On" the feature will be enabled.
 
 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>
@@ -229,12 +225,6 @@ When set to "Disabled" the feature will be disabled.</string>
             <presentation id="SearchBoxSize_PresentationID">
                 <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>
 </policyDefinitionResources>
\ No newline at end of file