diff --git a/.github/ISSUE_TEMPLATE/----bug-report.md b/.github/ISSUE_TEMPLATE/----bug-report.md
new file mode 100644
index 00000000..db30f325
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/----bug-report.md
@@ -0,0 +1,20 @@
+---
+name: " \U0001F41B Bug Report"
+about: Did something not work?
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+## Description of the problem
+
+## How has this issue affected you? What are you trying to accomplish?
+
+### Logs or Screenshots: (optional)
+
+### Your Environment
+
+| Software         | Name/Version |
+| ---------------- | ------------ |
+| Operating System |              |
diff --git a/.github/ISSUE_TEMPLATE/---feature.md b/.github/ISSUE_TEMPLATE/---feature.md
new file mode 100644
index 00000000..945a67eb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---feature.md
@@ -0,0 +1,12 @@
+---
+name: "\U0001F308 Feature"
+about: " What cool thing would you like to add?"
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+# What is this feature? 
+# How the feature should work?
+# You have examples or an idea of how it can be implemented?
diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
deleted file mode 100644
index 4de26c77..00000000
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-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:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**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
deleted file mode 100644
index 53842951..00000000
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-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. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.