diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index dae4712..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-    Thanks for filing a new issue on MobArena! To help us help you, please use
-    this template for filing your bug, feature request, or other topic.
-
-    If you use this template, it helps the developers review your ticket and
-    figure out the problem. If you don't use this template, we may close your
-    issue as not enough information.
- -->
-
-# Summary
-
-<!--
-    Choose the type of issue you are filing. Pick one by typing [X] in any
-    field. For example, bug reports look like…
-
-    [X] Bug report
- -->
-
-* This issue is a…
-    * [ ] Bug report
-    * [ ] Feature request
-    * [ ] Documentation request
-    * [ ] Other issue
-    * [ ] Question
-* **Describe the issue / feature in 1-2 sentences**: 
-
-
-# Background
-
-<!--
-    IF THIS IS A BUG REPORT:
-
-    * Delete the "Feature request" section
-    * Include all requested info
-
-    You can get some of this info by typing these commands in-game:
-        /version MobArena: Get your MobArena plugin version
-        /version: Get your Bukkit/Spigot server version
-        /plugins: Get the plugins running on your server
- 
-
-    IF THIS IS A FEATURE REQUEST:
-
-    * Delete the "Bug report" section
-    * Be descriptive – help us understand your idea
-    * Consider any issues that might happen if your idea is added
-    * Does it affect other features of MobArena?
- -->
-
-### Bug report
-
-* **MobArena version**: 
-* **Server version**: 
-* **Plugins**: 
-
-### Feature request 
-
-* **Feature type**:
-    * [ ] Arena configuration
-    * [ ] Classes
-    * [ ] Documentation
-    * [ ] Economy integration
-    * [ ] Leaderboards
-    * [ ] New config settings
-    * [ ] Other (please explain)
-    * [ ] Rewards
-    * [ ] Third-party plugin support
-
-**What does it do?**: 
-
-**Does it need new or changed commands? What are they?**: 
-
-**Does this feature affect other parts of MobArena?**: 
-
-
-# Details
-
-<!--
-    If you have any other details to include, like screenshots, stacktraces¹, or
-    something more detailed, please include it here!
-
-    ¹ Stacktraces are the error messages you see in the console of your server.
-    If you have a long stacktrace, DO NOT PASTE IT HERE! Please use Pastebin and
-    add a link here.
- -->
-
-* **Stacktrace** (if applicable): 
-
-<!--
-    Phew, all done! Thanks for filing a new issue! We'll get back to you soon.
- -->
-
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..147cd08
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Let us know if you found a bug or encountered an error.
+---
+
+# Bug report
+<!--
+  Thanks for submitting a bug report!
+  
+  Please fill out this template to provide us with the information we need
+  to get the bug fixed as quickly as possible :)
+  
+  If you don't use the template, we may reject the issue.
+-->
+
+**Short description**
+<!-- What is the bug? What happens? -->
+
+When I join the arena, X doesn't work.
+
+
+**Reproduction steps**
+<!-- How can we reproduce the bug? -->
+
+1. Join an arena with /ma join
+2. Hit a sign to pick a class
+3. Error appears in console
+
+
+**Details**
+<!-- Server info and pastebin with stacktrace -->
+
+* **MobArena version**: 0.1.2
+* **Server version**: Spigot 3.4.5
+* **Stacktrace** (if applicable): https://pastebin.com/gB5qbcnr
+
+
+**Additional info**
+<!-- Is there anything else we need to know? -->
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 0000000..75b22a7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,23 @@
+---
+name: Documentation
+about: Help us improve the documentation.
+---
+
+# Documentation
+<!--
+  Thanks for helping improve the documentation!
+  
+  Please fill out this template to provide us with the information we need
+  to work out the kinks in the documentation :)
+  
+  If you don't use the template, we may reject the issue.
+-->
+
+**Description**
+<!-- What needs to be documented or improved? -->
+
+The documentation for X is confusing, making Y difficult.
+
+
+**Additional info**
+<!-- Is there anything else we need to know? -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..101b9bd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,29 @@
+---
+name: Feature request
+about: Suggest a new feature or an improvement for an existing one.
+---
+
+# Feature request
+<!--
+  Thanks for sharing your idea!
+  
+  Please fill out this template to provide us with the information we need
+  to start working on your idea as quickly as possible :)
+  
+  If you don't use the template, we may reject the issue.
+-->
+
+**Short description**
+<!-- Pitch your idea in a few sentences. -->
+
+We should have a way to do X with Y.
+
+
+**Implementation details**
+<!-- How would this work? Is it customizable? What does it affect? -->
+
+A per-arena setting could make Z configurable.
+
+
+**Additional info**
+<!-- Is there anything else we need to know? -->