diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE.md
diff --git a/.github/ISSUE_TEMPLATE/Bug.md b/.github/ISSUE_TEMPLATE/Bug.md
new file mode 100644
index 0000000..1a87797
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug.md
@@ -0,0 +1,50 @@
+---
+name:  Bug Report
+about: Something is broken?
+---
+
+<!--
+Note: All issues will instant closed if the issue template is not complete. Please understand that it is easier for us if you fill out the template to help you faster.
+
+!All text inside \<\!-- \--\> will be hidden from us so please remove the arrows in the statements below.
+-->
+
+### Bug Report
+
+#### Summary
+<!-- Provide a summary desciribing the problem you are experiencing. -->
+
+Affected module: <module name>
+
+Description:
+<description>
+
+##### What is the current behaviour?
+<!-- it crashed -->
+
+#### How to reproduce
+
+##### If the current behaviour is a bug, please provide the steps to reproduce it.
+<!-- A great way to do this is to provide screenshots and commands.* -->
+
+##### What do you think the expected behaviour should be?
+<!--What do you think should happen?-->
+
+##### If this is a feature request, what is the motivation or use case for the added feature?
+
+##### Specs
+*Paste the output of `./script/diagnostics.sh [interface]`*
+
+#### Expected behavior
+<!-- What was the expected (correct) behavior? -->
+
+<!--
+If you are having problems with fonts, please read:
+https://github.com/tobi-wan-kenobi/bumblebee-status/issues/228
+https://github.com/tobi-wan-kenobi/bumblebee-status/issues/210
+https://github.com/tobi-wan-kenobi/bumblebee-status/issues/197
+https://github.com/tobi-wan-kenobi/bumblebee-status/issues/233
+
+Please note FontAwesome 5 is currently not supported:
+https://github.com/tobi-wan-kenobi/bumblebee-status/issues/239-->
+
diff --git a/.github/ISSUE_TEMPLATE/Feature.md b/.github/ISSUE_TEMPLATE/Feature.md
new file mode 100644
index 0000000..9adde8b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature.md
@@ -0,0 +1,16 @@
+---
+name: Feature Request
+about: You have a neat idea that should be implemented?
+---
+
+### Feature Request
+<!-- Fill in the relevant information below to help triage your issue. -->
+
+|    Q        |   A
+|------------ | ------
+| New Feature | yes
+| RFC         | yes/no
+| BC Break    | yes/no
+
+#### Summary
+<!-- Provide a summary of the feature you would like to see implemented. -->
diff --git a/.github/ISSUE_TEMPLATE/Support.md b/.github/ISSUE_TEMPLATE/Support.md
new file mode 100644
index 0000000..e3802f8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support.md
@@ -0,0 +1,20 @@
+---
+name: ❓ Support Question
+about: Have a problem that you can't figure out?
+---
+
+<!-- Fill in the relevant information below to help triage your issue. -->
+<!--
+Note: All issues will instant closed if the issue template is not complete. Please understand that it is easier for us if you fill out the template to help you faster.
+
+!All text inside \<\!-- \--\> will be hidden from us so please remove the arrows in the statements below.
+-->
+
+|    Q        |   A
+|------------ | -----
+| Version     | x
+
+
+#### Support Question
+<!-- Describe the issue you are facing here. -->
+
diff --git a/.github/PULL_REQUEST_TEMPLATE/Improvement.md b/.github/PULL_REQUEST_TEMPLATE/Improvement.md
new file mode 100644
index 0000000..44d9eeb
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/Improvement.md
@@ -0,0 +1,16 @@
+---
+name: Improvement
+about: You have some improvement to make Bumblebee-status bar better?
+---
+
+### Improvement
+<!-- Fill in the relevant information below to help triage your issue. -->
+
+|    Q        |   A
+|------------ | ------
+| New Feature | yes
+| RFC         | yes/no
+| BC Break    | yes/no
+
+#### Summary
+<!-- Provide a summary of the improvement you are submitting. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/Other.md b/.github/PULL_REQUEST_TEMPLATE/Other.md
new file mode 100644
index 0000000..65da67e
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/Other.md
@@ -0,0 +1,18 @@
+---
+name: Other
+about: You have some other ideas you want to introduce? 
+---
+
+<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
+
+**What kind of change does this PR introduce?**
+<!-- E.g. a bugfix, feature, refactoring, build related change, etc… -->
+
+**Summary**
+<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
+<!-- Try to link to an open issue for more information. -->
+
+**Does this PR introduce a breaking change?**
+<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
+
+**Other information**