diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 55%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug-report.md
index 9d74ed5..10d4bc9 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,25 +1,31 @@
-[Please search for tickets with the same issues as yours first before reporting!]
+---
+name: Bug report
+about: An error that happens in the plugin.
+
+---
 
 #### Plugin Version
 [The full plugin version that you are running from /version ChestShop]
- 
+ 
 #### Plugin Config
 [The full config.yml file of ChestShop]
- 
+ 
 #### Server Version
 [The full server version that you are running from /version]
- 
+ 
 #### Server Log
-[The full latest.log file]
+[The full latest.log file, especially important if you have a stack trace]
 
 #### What other plugins are you running?
-[List of your plugins, ideally with the version] 
+[List of your plugins, ideally with the version] 
 
 #### What is happening?
-[Explain what happens and what steps should be done to reproduce the issue. Ideally with pictures and the full error log!] 
+[Explain what happens and what steps should be done to reproduce the issue. Ideally with pictures and the full error log!] 
 
 #### What did you expect to happen?
 [Explain what you expected to happen after performing the previously described steps]
 
-Please provide any additional info below
-[And delete the lines in square brackets]
\ No newline at end of file
+### Additional context
+[Add any other context or screenshots about the feature request here.]
+
+[And Delete the lines in square brackets!]
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
new file mode 100644
index 0000000..a7d1956
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,19 @@
+---
+name: Enhancement
+about: Request a feature or 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.]
+
+[And Delete the lines in square brackets!]
\ No newline at end of file