diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 8941540..e3eb417 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,12 +7,35 @@ assignees: jef
 
 ---
 
-### Description
+<!--- Feel free to join our discord server (https://discord.gg/gbVY4vB9JF) for general support --->
+<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
 
-<!-- Describe the bug here. -->
-<!-- Please be as detailed as possible. -->
-<!-- Include OS, screenshots and console outputs. -->
+## Expected Behavior
 
-### Possible solution
+<!--- Tell us what should happen -->
 
-<!-- Describe the possible solution here. -->
+## Current Behavior
+
+<!--- Tell us what happens instead of the expected behavior -->
+
+## 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.
+2.
+3.
+4.
+
+## Environment
+
+**OS:**
+**.env file:**
+
+```dotenv
+
+```
+
+## Logs
+
+<!--- Provide a brief log -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0925758..d492f8e 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,10 +7,10 @@ assignees: jef
 
 ---
 
-### Description
+## Description
 
-<!-- Describe the feature here. -->
+<!-- Describe the feature here -->
 
-### Possible solution
+## Possible solution
 
-<!-- Describe the possible solution here. -->
+<!-- Describe the possible solution here -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 590cc48..727368c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -7,6 +7,6 @@ assignees: jef
 
 ---
 
-### Description
+## Description
 
-<!-- Describe the feature here. -->
+<!-- Describe the question here -->