diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a2e717d..0b5257b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,23 +1,70 @@
----
 name: Bug report
 about: Report problems/issues here
-title: ''
 labels: bug
-assignees: ''
+body:
+- type: checkboxes
+  attributes:
+    label: Have you searched the wiki and looked for existing issues for this?
+    description: Check the wiki first in case this is a common issue. If it isn't make sure that no one else has reported it yet.
+    options:
+    -  label: This is not a common issue or cannot be fixed by the solutions provided
+       required: true
+    -  label: This issue has not been reported yet
+       required: true
 
----
+- type: textarea
+  attributes:
+    label: What's happening
+    description: Describe the issue that you're having. Make sure to be clear and concise.
+  validations:
+    required: true
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+- type: textarea
+  attributes:
+    label: What's supposed to happen
+    description: Describe what should be happening
+  validations:
+    required: true
 
-**Expected behavior**
-A clear and concise description of what you expected/is supposed to happen.
+- type: dropdown
+  attributes:
+    label: Server Software
+    description: What type of server are you running RTW on?
+    options:
+      - Bukkit
+      - Paper
+      - Spigot
+      - Other
+  validations:
+    required: true
 
-**Software Information**
- - Paper/Spigot/Bukkit (with build/release number)
- - Minecraft version
- - Link to server log (upload at https://mclo.gs/)
- - Link to configuration log **(REMOVE YOUR API KEY!)** (upload at https://pastebin.com/)
+- type: input
+  attributes:
+    label: Minecraft version
+    description: What version of Minecraft is your server running?
+    placeholder: Example: 1.19.2
+  validations:
+    required: true
 
-**Additional context**
-Add any other context about the problem here.
+- type: input
+  attributes:
+    label: Server log
+    description: If applicable, paste the link to your server log here
+    placeholder: Get a link at https://pastebin.com/
+  validations:
+    required: false
+
+- type: input
+  attributes:
+    label: RTW configuration
+    description: If applicable, paste the link to your configuration file here **(REMEMBER TO REMOVE YOUR API KEY)**
+    placeholder: Get a link at https://pastebin.com/
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Additional information
+    description: Put any more information (including screenshots and videos) that you might have here
+  validations:
+    required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 1bf6be8..55e8598 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,14 +1,18 @@
----
 name: Feature request
-about: Make suggestions here
-title: ''
+about: Use this to request new features and/or changes
 labels: enhancement
-assignees: ''
+body:
+- type: checkboxes
+  attributes:
+    label: Is there already a request similar to this?
+    description: Check the [other feature requests](https://github.com/Jack1424/RealTimeWeather/issues?q=label%3Aenhancement+) and ensure that this hasn't been requested yet
+  options:
+    -  label: There are and have not been any feature requests similar to this
+       required: true
 
----
-
-**Describe the Suggestion**
-Let me know what you would like me to add, remove, or change
-
-**Related Issues**
-Mention any issues or problems (either on GitHub or not) that this suggestion is related too
+- type: textarea
+  attributes:
+    label: What's your suggestion?
+    description: Use the space below to describe your suggestion. Feel free to attach any relevant files/links.
+  validations:
+    required: true
\ No newline at end of file