diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/Bug_report.md
similarity index 81%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/Bug_report.md
index be4f8168..a8c9faee 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,3 +1,13 @@
+---
+name: "\U0001F41BBug report"
+about: Report a bug in MithrilJS
+---
+
+### Mithril Version: x.x.x
+
+<!--- Provide the exact version of MithrilJS in which you see the bug.  -->
+
+
 <!--- Provide a general summary of the issue in the Title above -->
 
 ## Expected Behavior
@@ -12,7 +22,7 @@
 <!--- Not obligatory, but suggest a fix/reason for the bug, -->
 <!--- or ideas how to implement the addition or change -->
 
-## Steps to Reproduce (for bugs)
+## Steps to Reproduce
 <!--- Provide a link to a live example, or an unambiguous set of steps to -->
 <!--- reproduce this bug. Include code to reproduce, if relevant -->
 1.
@@ -24,9 +34,12 @@
 <!--- How has this issue affected you? What are you trying to accomplish? -->
 <!--- Providing context helps us come up with a solution that is most useful in the real world -->
 
+<details>
+  <summary>Additional Information</summary>
+
 ## Your Environment
 <!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
 * Browser Name and version:
 * Operating System and version (desktop or mobile):
 * Link to your project:
+</details>
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 00000000..eed57e70
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,25 @@
+---
+name: "\U0001F680Feature or Enhancement"
+about: Suggest an Idea or Enhancement for MithrilJS
+---
+
+### Description
+
+<!--- Provide a detailed description of the change or addition you are proposing -->
+
+### Why
+
+<!--- Why is this change important to you? How would you use it? -->
+
+<!--- How can it benefit other users? -->
+
+### Possible Implementation & Open Questions
+
+<!--- Not obligatory, but suggest an idea for implementing addition or change -->
+
+<!--- What still needs to be discussed -->
+
+### Is this something you're interested in working on?
+
+<!--- Yes or no -->
+