diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b301e02f..169afc0c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,5 @@
 name: "Bug Report"
 description: "Report an issue with the software."
-title: "[Bug]: "
 labels: ["bug"]
 body:
   - type: textarea
@@ -63,7 +62,6 @@ body:
       label: "Logs"
       description: "Please provide the logs."
       placeholder: "Paste your Kodi logs here..."
-      render: "python"
     validations:
       required: true
 
@@ -73,7 +71,6 @@ body:
       label: "Server Logs"
       description: "Please provide server logs (if relevant)."
       placeholder: "Paste your server logs here..."
-      render: "csharp"
     validations:
       required: false
 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000..3b7c1c88
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,60 @@
+name: Feature Request
+description: Suggest a feature or enhancement for the project
+labels: enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for suggesting a new feature! Please take a moment to fill out the following details to help us understand your idea better.
+
+  - type: input
+    id: short-description
+    attributes:
+      label: Short Description
+      description: A brief summary of the feature you are requesting.
+      placeholder: "Add a short, descriptive title for your feature request."
+    validations:
+      required: true
+
+  - type: textarea
+    id: user-story
+    attributes:
+      label: User Story
+      description: |
+        Please provide a user story for the feature.
+      placeholder: |
+        "As a [type of user], I want [a goal] so that [benefit]."
+
+        Acceptance Criteria:
+        [List of measurable criteria to ensure the feature works as intended.]
+    validations:
+      required: true
+
+  - type: textarea
+    id: why-needed
+    attributes:
+      label: Why is this feature needed?
+      description: Explain why this feature would be beneficial and how it improves the project.
+      placeholder: "Describe why this feature would be useful."
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional Context
+      description: Provide any other details or resources (like screenshots, designs, or links) that might help us understand your request.
+      placeholder: "Add any additional information here."
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: agreement
+    attributes:
+      label: Agreement
+      description: Please confirm the following before submitting.
+      options:
+        - label: I have searched the existing issues to ensure this feature has not been requested before.
+          required: true
+        - label: I have provided enough detail to explain the value of this feature.
+          required: true