diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100755
index aac81e5..0000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Reporting an Issue
-
-Thank you for taking the time to contribute to the Hyper Pokémon theme 🎉
-
-## Suggested quick smart steps
-
-- Run through the [contributing guidelines](https://github.com/klauscfhq/hyper-pokemon/blob/master/contributing.md)
-- Support questions are better asked in the project's [chat](https://gitter.im/klauscfhq/hyper-pokemon). We will get back at you in a flash.
-- Ensure the issue is not already reported
-
-*Delete the above section and the content in the sections below before submitting your issue*
-
-## Description
-
-Please provide as much *relevant* info as possible
-
-## Error Message (if any)
-
-```
-Copy the error message here
-```
-
-## Theme settings
-
-```
-Copy your theme settings here
-```
-
-## Relevant Links (if any)
-
-- Any link to an other project that you believe it might be relevant
-
-## Environment
-
-Tell us which operating system you are using, as well as which versions of [Hyper](https://github.com/zeit/hyper/releases/latest) and [Hyper Pokémon](https://github.com/klauscfhq/hyper-pokemon/releases).
-
-## Additional Information
-
-Include any additional information, configuration or data that might be necessary to reproduce the issue.
diff --git a/.github/issue_template/bug_report.md b/.github/issue_template/bug_report.md
new file mode 100644
index 0000000..aa3c464
--- /dev/null
+++ b/.github/issue_template/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Technical Info (please complete the following information)**
+ - OS:
+ - Hyper version:
+ - Hyper-Pokemon version:
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/issue_template/feature_request.md b/.github/issue_template/feature_request.md
new file mode 100644
index 0000000..93ce9cf
--- /dev/null
+++ b/.github/issue_template/feature_request.md
@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+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.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.