diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index 8dee05441..000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,3 +0,0 @@
-<!--
-* If adding words to the filter list in events.py, make sure all characters are lowercase and consist only of characters in Python [`string.printable`](https://docs.python.org/3/library/string.html).
--->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bot-issue.md b/.github/ISSUE_TEMPLATE/bot-issue.md
new file mode 100644
index 000000000..83b74f37b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bot-issue.md
@@ -0,0 +1,10 @@
+---
+name: Bot Issue
+about: Found an issue related to kurisu?
+title: "[Bot Issue] "
+labels: ''
+assignees: ''
+
+---
+
+**Issue Description**
diff --git a/.github/ISSUE_TEMPLATE/error-submission.md b/.github/ISSUE_TEMPLATE/error-submission.md
new file mode 100644
index 000000000..467c3e60f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/error-submission.md
@@ -0,0 +1,20 @@
+---
+name: Error Submission
+about: Found a Wiiu, 3DS or Switch error not implemented in kurisu?
+title: "[Error Submission] Error ######"
+labels: ''
+assignees: ''
+
+---
+
+**Console**
+
+<!--Your console, only Wiiu, 3DS, Switch supported-->
+
+**Error Code**
+
+<!--The error code you found-->
+
+**Error Description**
+
+<!--What causes this error and what does it mean?-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8dee05441..567666f0f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,3 @@
 <!--
-* If adding words to the filter list in events.py, make sure all characters are lowercase and consist only of characters in Python [`string.printable`](https://docs.python.org/3/library/string.html).
--->
\ No newline at end of file
+* Test your code before submitting a PR, check https://github.com/nh-server/Kurisu on how to do so
+-->