diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a43d91c3..2a67d302 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Meshtastic Public Beta Test Flight  Link
+  - name: Test Flight Beta Link
     url: https://testflight.apple.com/join/c8nNl8q1
-    about: Please submit any bugs through TestFlight, bugs submitted as GitHub issues will be closed.
+    about: Please submit bugs through the App Store or TestFlight, bugs submitted as GitHub issues will be closed.
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 00000000..71a6ae15
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,28 @@
+name: Feature Request
+description: Request a new feature
+title: "[Enhancement]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for your request this will not gurantee that we will implement it, but it will be reviewed.
+  - type: dropdown
+    id: soc
+    attributes:
+      label: OS
+      description: What OS will support your feature?
+      multiple: true
+      options:
+        - iOS
+        - iPadOS
+        - macOS
+    validations:
+      required: true
+  - type: textarea
+    id: body
+    attributes:
+      label: Description
+      description: Please provide details about your enhancement.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 9c9fa154..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature idea for this project
-title: 'Feature Request: '
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index 26217314..c2336593 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
     <img alt="Meshtastic App Store Launch Image" src="meshtastic-1080x1080.png" />
 </a>
 
-
 ## Overview
 
 SwiftUI client applicaitons for iOS, iPadOS and macOS.
@@ -17,7 +16,7 @@ SwiftUI client applicaitons for iOS, iPadOS and macOS.
 
 ## Code Standards
 
-- Use SwiftUI (Maps are an exception)
+- Use SwiftUI (Maps are the exception)
 - Use Hierarchical icons
 - Use Core Data for persistence
 - Requires SwiftLint - see https://github.com/realm/SwiftLint