diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index ab60a13..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-<!--A clear and concise description of what the bug is.-->
-
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-<!--A clear and concise description of what you expected to happen.-->
-
-**Screenshots**
-<!--If applicable, add screenshots to help explain your problem.-->
-
-**OS Information**
-Commit(optional):
-OS specifics:
-
-**Additional context**
-<!--Add any other context about the problem here.-->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..646f476
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,43 @@
+name: Bug report
+description: Create a report to help us improve
+labels: bug
+body:
+- type: textarea
+  attributes: 
+    label: Describe the Bug
+    description: A clear and concise description of what the bug is.
+  validations:
+    required: true
+- type: textarea
+  attributes: 
+    label: To Reproduce 
+    description: Steps to reproduce the behavio(u)r
+    value: |-
+      1. Go to '...'
+      2. Click on '....'
+      3. Scroll down to '....'
+      4. See error
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Expected Behavio(u)r
+    description: A clear and concise description of what you expected to happen.
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Version/Commit Hash
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: OS Specifics
+    description: Output of `uname -a` or the Windows build number
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: Screenshots
+    description: If applicable, add screenshots to help explain your problem.
+    
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index b542b3d..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature request
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.(Optional)**
-<!--A clear and concise description of what the problem is. -->
-
-**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/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..8d5d82b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,24 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: feature request
+body:
+- type: textarea
+  attributes: 
+    label: Is your feature request related to a problem? Please describe.
+    description: A clear and concise description of what the bug is.
+- type: textarea
+  attributes: 
+    label: Describe the solution you'd like
+    description: A clear and concise description of what you want to happen.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Describe alternatives you've considered
+    description: A clear and concise description of any alternative solutions or features you've considered.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional context
+    description: Add any other context or screenshots about the feature request here.