diff --git a/.github/ISSUE_TEMPLATE/code_quality_issue.yml b/.github/ISSUE_TEMPLATE/code_quality_issue.yml
index b1613fa819b7..ecd0fbbcdde9 100644
--- a/.github/ISSUE_TEMPLATE/code_quality_issue.yml
+++ b/.github/ISSUE_TEMPLATE/code_quality_issue.yml
@@ -1,5 +1,5 @@
 name: Code Quality Issue
-description: Create a code quality issue to help Files keep a clean codebase
+description: Create a code quality issue to help Files keep a clean codebase.
 type: 'Code quality'
 title: 'Code Quality: '
 body:
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 31ea2d803bad..5094d1f64778 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -9,7 +9,7 @@ body:
     attributes:
       value: |
         > [!TIP]
-        >Have you checked for similar feature requests? There's a possibility your suggestion is already being tracked. Please do a thorough search before creating a new issue.
+        > Have you checked for similar feature requests? There's a possibility your suggestion is already being tracked. Please do a thorough search before creating a new issue.
 
   # Description
   - type: textarea
@@ -25,7 +25,7 @@ body:
       value: |
         ---
 
-        Please include a list changes required to make this improvement. A good rule of thumb is to start your proposal with no more than 7 high-level requirements.
+        What will need to change in order for this feature to be implemented? A good rule of thumb is to start your proposal with no more than 7 high-level requirements.
 
   # Requirements
   - type: textarea
@@ -49,16 +49,6 @@ body:
     validations:
       required: true
 
-  # Windows Version
-  - type: input
-    id: windows_version
-    attributes:
-      label: Windows Version
-      description: Which version of Windows are you using? To copy your Windows version, access it from Settings -> About -> Copy -> Windows version.
-      placeholder: "e.g. 10.0.22621.1848"
-    validations:
-      required: true
-
   # Additional Comments
   - type: textarea
     attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 96c94cd49424..409b8f4559ed 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,12 +8,23 @@ I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
 
 **Resolved / Related Issues**
 
-To prevent extra work, all changes to the Files codebase must link to an approved issue marked as `Ready to build`. Please insert the issue number following the hashtag with the issue number that this Pull Request resolves.
+<!--
+To prevent extra work, all changes to the Files codebase must link to an approved issue marked as `Ready to build`.
+Please insert the issue number following the hashtag with the issue number that this pull request resolves.
+-->
+
 - Closes #
 
 **Steps used to test these changes**
 
-Stability is a top priority for Files and all changes are required to go through testing before being merged into the repo. Please include a list of steps that you used to test this PR.
+<!--
+Stability is a top priority for Files and all changes are required to go through testing before being merged into the repo.
+Please include a list of steps that you used to test this PR.
+-->
 
 1. Opened Files ...
 2. ...
+
+---
+
+<!-- Write a detailed description of your changes here -->