diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 0000000000..972fa93530
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,26 @@
+---
+name: Bug Report
+about: Create a report to help us improve
+title: "[BUG] - PLUGIN/THEMENAME"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+When does the bug occur.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Discord Built (stable, ptb or canary):**
+Which built o discord are you using.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000..a4496de13c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Name**
+In which plugin or theme does the bug occur.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+When does the bug occur.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Discord Built (stable, ptb or canary):**
+Which built o discord are you using.
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature-improvement-request.md b/.github/ISSUE_TEMPLATE/feature-improvement-request.md
new file mode 100644
index 0000000000..2944291c51
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-improvement-request.md
@@ -0,0 +1,17 @@
+---
+name: Feature/Improvement Request
+about: Suggest an idea for this project
+title: "[IMPROVEMENT] - PLUGIN/THEMENAME"
+labels: improvement
+assignees: ''
+
+---
+
+**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.