diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index abab322..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,25 +0,0 @@
-### What behaviour is observed:
-_What you saw_
-### What behaviour is expected:
-_What you expected to see_
-### Steps/models to reproduce:
-_This may include a build schematic, a video, or detailed instructions to help reconstruct the issue_
-
-### Spigot/Craftbukkit/Paper and GriefPrevention version:
-___This can be found by running `/version` and `/version GriefPrevention` on your server.___
-
-
-### Stack trace/error
-
-```
-Paste entire stack trace inside here (don't remove the backticks!)
-If not applicable, paste server.log at gist.github.com and paste the link here
-```
-
-### GriefPrevention config.yml (if applicable)
-
-```yml
-Paste config inside here (don't remove the backticks!)
-```
-
-### Plugin list (if applicable):
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000..d58b615
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,42 @@
+---
+name: Bug report
+about: Report bugs or scary stacktraces (the big scary red lines that say SomethingException)
+
+---
+
+### What happened:
+_What you saw_
+
+### What you expected:
+_What you expected to see_
+
+### Steps to reproduce:
+__This may include a build schematic, a video, or detailed instructions to help reconstruct the issue__
+1. Step 1.
+2. Step 2.
+3. ???
+4. Profit!
+
+### Server and GriefPrevention version:
+___This can be found by running `/version` and `/version GriefPrevention` on your server.___
+Paste of `/version`: 
+Paste of `/version GriefPrevention`:
+
+
+### Stack trace/error or server log
+
+```
+Paste entire stack trace right here inside these backticks.
+
+If not applicable, paste the server.log at gist.github.com and paste the link here.
+```
+
+### GriefPrevention config.yml
+
+```yml
+
+Paste the config.yml right here inside these backticks.
+
+```
+
+### Plugin list (if applicable):
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 0000000..d1977d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,5 @@
+---
+name: Feature enhancement or request
+about: Improvements or ideas for GriefPrevention
+
+---