diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
new file mode 100644
index 00000000..0c32b686
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -0,0 +1,19 @@
+---
+name: "\U0001F41B Bug Report"
+about: "If something isn't working as expected \U0001F914"
+
+---
+
+Version: ?.?.?
+
+### Bug Description
+... A clear and concise description of what the bug is. A good bug report shouldn't leave others needing to chase you up for more information.
+
+### Steps To Reproduce
+... If possible a minimal demo of the problem ...
+
+### Expected Behavior
+... A clear and concise description of what you expected to happen.
+
+### Possible Solution
+... Only if you have suggestions on a fix for the bug
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
new file mode 100644
index 00000000..9b08dd6c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,9 @@
+---
+name: "\U0001F680 Feature Request"
+about: "I have a suggestion (and may want to implement it \U0001F642)"
+
+---
+
+- Is your feature request related to a problem? Please describe.
+- Explain your intentions.
+- It's up to you to make a strong case to convince the project's developers of the merits of this feature.
diff --git a/.github/ISSUE_TEMPLATE/Support_us.md b/.github/ISSUE_TEMPLATE/Support_us.md
new file mode 100644
index 00000000..807655c1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Support_us.md
@@ -0,0 +1,19 @@
+---
+name: "❤️ Support us"
+about: "If you would like to support our efforts in maintaining this project 🙌"
+
+---
+
+--------------^ Click "Preview" for a nicer view!
+
+> https://nette.org/donate
+
+Help support Dibi!
+
+We develop Dibi for more than 14 years. In order to make your life more comfortable. Dibi cares about the safety of your sites. Dibi saves you time. Dibi earns you money. And is absolutely free.
+
+To ensure future development and improving the documentation, we need your donation.
+
+[Please make a donation now](https://nette.org/donate).
+
+Thank you!
diff --git a/.github/issue_template.md b/.github/issue_template.md
deleted file mode 100644
index 1d02d14b..00000000
--- a/.github/issue_template.md
+++ /dev/null
@@ -1,16 +0,0 @@
-- bug report? yes/no
-- feature request? yes/no
-- version: ?.?.? <!-- exact release version, for bug reports -->
-
-### Description
-...
-
-### Steps To Reproduce
-... If possible a minimal demo of the problem ...
-
-<!--
-REMEMBER, AN ISSUE IS NOT THE PLACE TO ASK QUESTIONS. We will be happy to help you on Gitter https://gitter.im/nette/nette
-
-A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report.
-Feature requests are welcome. Explain your intentions. It's up to you to make a strong case to convince the project's developers of the merits of this feature.
--->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index b41cb73a..3900bc8a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,5 +1,4 @@
-- bug fix? yes/no   <!-- #issue numbers, if any -->
-- new feature? yes/no
+- bug fix / new feature?   <!-- #issue numbers, if any -->
 - BC break? yes/no
 
 <!--