diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..23a8a04
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,55 @@
+name: 🐛 Bug report
+description: Report a bug in Cookie Monster
+labels: [Bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Thank you for wanting to report a bug in Cookie Monster!**
+
+        ⚠ Please make sure that this [issue wasn't already requested][issue search], or already implemented in the ``dev`` branch.
+
+
+        [issue search]: https://github.com/CookieMonsterTeam/CookieMonster/issues?q=is%3Aissue+is%3Aopen+
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Bug description
+      description:
+        What is the bug about?
+      placeholder: |
+        # Please describe the bug and what you would have expected the mod to do
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To reproduce
+      description:
+        How can you reproduce the bug?
+      placeholder: |
+        The steps needed to reproduce the behavior: 
+        1.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshot
+      description: Please provide any relevant screenshots
+  - type: textarea
+    id: savefile
+    attributes:
+      label: Save file
+      description: Please provide a save file and paste it in between the "```"
+      placeholder: |
+        ```SAVE FILE HERE```
+  - type: textarea
+    id: environment
+    attributes:
+      label: Browser / Steam / Version
+      description: Are you playing on browser (if so, which?) or Steam? And which version?
+      placeholder: Steam, version 2.04
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 4db7374..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Bug report
-about: Please use this template to report bugs you might have found
-title: ''
-labels: Bug
-assignees: ''
-
----
-
-**Describe the bug**
-Please describe the bug and what you would have expected the mod to do
-
-**To Reproduce**
-The steps needed to reproduce the behavior:
-1. ...
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Save file**
-```
-Please add a save file here.
-This makes debugging much easier as we do not always have a good test save to debug the issue
-```
-**Browser**
-Please specify your current browser. This can help find/fix the bug!
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..9255235
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,29 @@
+name: ✨ Feature request
+description: Request a new feature for Cookie Monster
+labels: [Enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Thank you for wanting to suggest a new function for Cookie Monster!**
+
+        ⚠ Please make sure that this [feature wasn't already requested][issue search], or already implemented in the ``dev`` branch.
+
+
+        [issue search]: https://github.com/CookieMonsterTeam/CookieMonster/issues?q=is%3Aissue+is%3Aopen+
+
+  - type: textarea
+    id: what-is-wanted
+    attributes:
+      label: Feature description
+      description:
+        Describe the function you'd like to see added to CookieMonster
+      placeholder: |
+        # A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Additional files
+      description: Add any other files such as save files or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 4daa125..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for CookieMonster
-title: ''
-labels: Enhancement
-assignees: ''
-
----
-
-**Describe the function you'd like to see added to CookieMonster**
-A clear and concise description of what you want to happen.
-
-**Additional files**
-Add any other files such as save files or screenshots about the feature request here.