diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 85be810..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Your issue may already be reported! Please search on the [issue tracker](../) before creating one.  
-
-**Note: for support questions, please use [/r/TheSilphRoad](https://reddit.com/r/thesilphroad)**. This repository's issues are reserved for feature requests and bug reports.
-
-## I'm submitting a ...
-  - [ ] bug report
-  - [ ] feature request
-
-## **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem**
-Try to include screenshots, or any other material to help us understand how to reproduce
-
-
-
-## **What is the expected behavior or new feature?**
-
-
-
-## **What is the motivation / use case for changing the behavior?**
-
-
-
-## **Please tell us about your environment, for bugs:**
-
-<!-- FILL IN ALL ANSWERS TO BETWEEN THE ":" and "<!--" -->
-
-- Operating System:   <!-- Mobile or Desktop? What version, etc -->
-- Browser:   <!-- BE SPECIFIC! Include the browser, version, and a list of any and all plugins/addons/extensions you have enabled -->
-
-
-## **Other information**
-(e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context)
-
-
diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
new file mode 100644
index 0000000..41f8f99
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_Report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report about something that's broken or not functioning as intended.
+
+---
+
+Your issue may already be reported! Please search on the [issue tracker](../) before creating one.  
+
+**Note: for support questions, please use [/r/TheSilphRoad](https://reddit.com/r/thesilphroad)** or email us at [team@thesilphroad.com](mailto:team@thesilphroad.com). This repository's issues are reserved for feature requests and bug reports.
+
+## I'm submitting a ...
+ * bug report
+  
+
+## **Please provide the steps to reproduce and if possible a minimal demo of the problem**
+*Try to include screenshots, or any other material to help us understand how to reproduce the issue. If possible give step by step instructions and / or a video.*
+
+
+
+## **What is the expected behavior?**
+*What should have happened instead of the bug you're reporting?*
+
+
+## **What is the motivation / use case for changing the behavior?**
+
+
+
+## **Please tell us about your environments you're expirencing the bugs on.**
+*(also specify if you have multiple environments available, which environment it works on, and which it doesn't. ie: it works in chrome on desktop, but not safari on mobile)*
+<!-- FILL IN ALL ANSWERS TO BETWEEN THE ":" and "<!--" -->
+
+- Operating System:   <!-- Mobile or Desktop? Android or iOS? Mac or Windows? What version, etc -->
+- Browser:   <!-- BE SPECIFIC! Include the browser, version, and a list of any and all plugins/addons/extensions you have enabled. about://version can give you any detail you're not sure of -->
+
+
+## **Other information**
+(e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context)
+
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 0000000..2e64162
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature Request
+about: Submit a request for a new feature or share an idea how to improve something.
+
+---
+
+Your issue may already be reported! Please search on the [issue tracker](../) before creating one.  
+
+**Note: for support questions, please use [/r/TheSilphRoad](https://reddit.com/r/thesilphroad)**. This repository's issues are reserved for feature requests and bug reports.
+
+## I'm submitting a ...
+ * feature request
+
+## **What is the new feature?**
+*(Be clear and concise, right to the point. Provide mockup images if applicable)*
+
+
+## **What is the motivation / use case for changing the behavior?**
+
+
+
+## **Other information**
+(e.g. detailed explanation, stacktraces, related issues, links for us to have context, mock-up images of what you envision the feature being like, or screenshots of your idea implimented on another platform)
+