diff --git a/CustomWindowsPreferences.admx b/CustomWindowsPreferences.admx
index e6f6879..9a06da3 100644
--- a/CustomWindowsPreferences.admx
+++ b/CustomWindowsPreferences.admx
@@ -118,38 +118,73 @@
                 <decimal value="0"/>
             </disabledValue>
         </policy>
-
-    <!--
-    POLICY "Open File Explorer to This PC"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
-        EXPLAIN "Set to enabled to force windows file explorer to automatically open with This PC selected"
-        VALUENAME "LaunchTo"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    POLICY "Show recent items in the File Explorer"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer"
-        EXPLAIN "Set to enabled to show recent items in file explorer"
-        VALUENAME "ShowRecent"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    POLICY "Show frequent items in the File Explorer"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer"
-        EXPLAIN "Set to enabled to show frequent items in file explorer"
-        VALUENAME "ShowFrequent"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    POLICY "Show recent items in the start menu"
-        KEYNAME "Software\Microsoft\Windows\CurrentVersion\Explorer"
-        EXPLAIN "Set to enabled to show recent items in file start menu"
-        VALUENAME "Start_TrackDocs"
-        VALUEON NUMERIC 1
-        VALUEOFF NUMERIC 0
-    END POLICY
-    -->
-
-
+        <policy
+        name="FileExplorerToC"
+        class="User"
+        displayName="$(string.FileExplorerToC_Display)"
+        explainText="$(string.FileExplorerToC_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"
+        valueName="LaunchTo"
+        >
+            <parentCategory ref="uwo"/>
+            <supportedOn ref="SUPPORTED_WIN10_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="FileExplorerRecent"
+        class="User"
+        displayName="$(string.FileExplorerRecent_Display)"
+        explainText="$(string.FileExplorerRecent_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer"
+        valueName="ShowRecent"
+        >
+            <parentCategory ref="uwo"/>
+            <supportedOn ref="SUPPORTED_WIN10_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="FileExplorerFrequent"
+        class="User"
+        displayName="$(string.FileExplorerFrequent_Display)"
+        explainText="$(string.FileExplorerFrequent_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer"
+        valueName="ShowFrequent"
+        >
+            <parentCategory ref="uwo"/>
+            <supportedOn ref="SUPPORTED_WIN10_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
+        <policy
+        name="FileExplorerTrackDocuments"
+        class="User"
+        displayName="$(string.FileExplorerTrackDocuments_Display)"
+        explainText="$(string.FileExplorerTrackDocuments_Explain)"
+        key="Software\Microsoft\Windows\CurrentVersion\Explorer"
+        valueName="Start_TrackDocs"
+        >
+            <parentCategory ref="uwo"/>
+            <supportedOn ref="SUPPORTED_WIN10_LATER"/>
+            <enabledValue>
+                <decimal value="1"/>
+            </enabledValue>
+            <disabledValue>
+                <decimal value="0"/>
+            </disabledValue>
+        </policy>
     </policies>
 </policyDefinitions>
diff --git a/en-US/CustomWindowsPreferences.adml b/en-US/CustomWindowsPreferences.adml
index 8557bae..6fa8251 100644
--- a/en-US/CustomWindowsPreferences.adml
+++ b/en-US/CustomWindowsPreferences.adml
@@ -55,6 +55,37 @@ When set to "Enabled" the peek feature is enabled.
 
 When set to "Disabled" the peek feature is disabled.</string>
 
+            <!-- FileExplorerToC -->
+            <string id="FileExplorerToC_Display">Open File Manager to "This PC"</string>
+            <string id="FileExplorerToC_Explain">This configuration option instructs File Manager to open to "This PC" drive when starting.
+
+When set to "Enabled" File Manager will open with "This PC" preselected.
+
+When set to "Disabled" File Manager will use its default behavior.</string>
+
+            <!-- FileExplorerRecent -->
+            <string id="FileExplorerRecent_Display">Show Recent items in File Manager</string>
+            <string id="FileExplorerRecent_Explain">This configuration option instructs File Manager to display recent items.
+
+When set to "Enabled" File Manager will display recent items.
+
+When set to "Disabled" File Manager will no longer display recent items.</string>
+
+            <!-- FileExplorerFrequent -->
+            <string id="FileExplorerFrequent_Display">Show Frequent items in File Manager</string>
+            <string id="FileExplorerFrequent_Explain">This configuration option instructs File Manager to display frequent items.
+
+When set to "Enabled" File Manager will display frequent items.
+
+When set to "Disabled" File Manager will no longer show frequent items.</string>
+
+            <!-- FileExplorerTrackDocuments -->
+            <string id="FileExplorerTrackDocuments_Display">Track recently opened documents.</string>
+            <string id="FileExplorerTrackDocuments_Explain">This configuration option instructs Windows to track recently opened documents and present them to the user to speed up the user experience.
+
+When set to "Enabled" Windows will track and display recently used items/files.
+
+When set to "Disabled" Windows Manager will no longer track and display recently used items/files.</string>
 
         </stringTable>
         <!-- Presentation IDs -->