diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 86ff5e6f65..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-name: "⭐ Feature request"
-about: Propose something new.
-title: ''
-labels: Triage-Needed
-assignees: ''
-
----
-
-## 📝 Provide a description of the new feature
-
-_What is the expected behavior of the proposed feature?  What is the scenario this would be used?_
-
----
-
-If you'd like to see this feature implemented, add a 👍 reaction to this post.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..b73afaf09f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,17 @@
+name: "⭐ Feature / enhancement request"
+description: Propose something new.
+labels: 
+- Triage-Needed 
+body:
+- type: textarea
+  attributes: 
+    label: Provide a description of the new feature / enhancement
+    placeholder: |
+      What is the expected behavior of the proposed feature?  
+      What is the scenario this would be used?  
+  validations:
+    required: true
+- type: markdown
+  attributes:
+    value: |
+      Please limit one request per issue.
diff --git a/src/common/utils/os-detect.h b/src/common/utils/os-detect.h
index 888c5a37ac..57c68e1b76 100644
--- a/src/common/utils/os-detect.h
+++ b/src/common/utils/os-detect.h
@@ -22,10 +22,3 @@ inline bool Is19H1OrHigher()
 {
   return IsAPIContractV8Available();
 }
-
-// This function returns true if the build is 19h1 or higher, so that we deploy the new settings.
-// It returns false otherwise.
-inline bool UseNewSettings()
-{
-  return Is19H1OrHigher();
-}
diff --git a/src/modules/previewpane/powerpreview/powerpreview.cpp b/src/modules/previewpane/powerpreview/powerpreview.cpp
index 27d13d2463..447e59a7e2 100644
--- a/src/modules/previewpane/powerpreview/powerpreview.cpp
+++ b/src/modules/previewpane/powerpreview/powerpreview.cpp
@@ -44,11 +44,9 @@ PowerPreviewModule::PowerPreviewModule() :
         std::make_unique<RegistryWrapper>(),
         L".svg\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}"));
 
-    // If the user is on the new settings interface, File Explorer might be disabled if they updated from old to new settings, so initialize the registry state in the constructor as PowerPreviewModule::enable/disable will not be called on startup
-    if (UseNewSettings())
-    {
-        update_registry_to_match_toggles();
-    }
+    // File Explorer might be disabled if user updated from old to new settings.
+    // Initialize the registry state in the constructor as PowerPreviewModule::enable/disable will not be called on startup
+    update_registry_to_match_toggles();
 }
 
 // Destroy the powertoy and free memory.
@@ -111,8 +109,8 @@ void PowerPreviewModule::set_config(const wchar_t* config)
         bool isElevated = is_process_elevated(false);
         for (auto& fileExplorerModule : m_fileExplorerModules)
         {
-            // If the user is using the new settings interface, as it does not have a toggle to modify enabled consider File Explorer to always be enabled
-            updateSuccess = updateSuccess && fileExplorerModule->UpdateState(settings, this->m_enabled || UseNewSettings(), isElevated);
+            // The new settings interface does not have a toggle to modify enabled, consider File Explorer to always be enabled
+            updateSuccess = updateSuccess && fileExplorerModule->UpdateState(settings, true, isElevated);
         }
 
         if (!updateSuccess)
@@ -131,12 +129,6 @@ void PowerPreviewModule::set_config(const wchar_t* config)
 // Enable preview handlers.
 void PowerPreviewModule::enable()
 {
-    // Should only be done for old settings as it is already done for new settings in the constructor.
-    if (!UseNewSettings())
-    {
-        update_registry_to_match_toggles();
-    }
-
     if (!this->m_enabled)
     {
         Trace::EnabledPowerPreview(true);