diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000..6d14b958
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,67 @@
+name: Bug Report
+description: File a bug report.
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Need help or support?
+        Please don't open an issue! Head to https://chatbegruenung.de/channel/sunflower-wordpress or https://verdigado.com/kontakt/.
+
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Tell us what should happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Website or Screenshots
+      description: If applicable, add a link to the website or add screenshots to help explain your problem.
+  
+  - type: textarea
+    attributes:
+      label: Additional context/info to reproduce
+
+  - type: textarea
+    attributes:
+      label: Possible Fix
+      description: If you have suggestions on a fix for the bug.
+
+  - type: input
+    attributes:
+      label: Devise
+      placeholder: "Desktop/Smartphone"
+
+  - type: input
+    attributes:
+      label: OS
+      placeholder: "e.g. iOS, Android, Windows"
+
+  - type: input
+    attributes:
+      label: Browser
+      placeholder: "e.g. Google Chrome, safari, Microsoft Edge, Mozilla Firefox"
+
+  - type: input
+    attributes:
+      label: Version of the sunflower theme
+      placeholder: "v0.0.0"
+
+  - type: input
+    attributes:
+      label: WordPress version
+      placeholder: "v0.0.0"
+
+  - type: input
+    attributes:
+      label: PHP version
+      placeholder: "v0.0.0"
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c3d157e..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve sunflower theme
-title: ''
-labels: ''
-assignees: ''
----
-
-## Describe the bug
-A clear and concise description of what the bug is.
-
-### Website or Screenshots
-If applicable, add an link to the website or add screenshots to help explain your problem.
-
-### Environment
-- Desktop/ Smartphone
- - Devise: Desktop/ Smartphone
- - OS: [e.g. iOS/ Android]
- - Browser [e.g. chrome, safari]
- - Version of the sunflower theme [e.g. 2.1.5 for recent]
- - WordPress version [e.g. 6.5]
- - PHP version [e.g. 8.2]
-
-## Additional context
-Add any other context about the problem here.
-
-## Possible Fix
diff --git a/.github/ISSUE_TEMPLATE/docs.yml b/.github/ISSUE_TEMPLATE/docs.yml
new file mode 100644
index 0000000..dcaff0f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/docs.yml
@@ -0,0 +1,23 @@
+name: Documentation
+description: Are the docs lacking or missing something?
+labels: ["documentation"]
+body:
+  - type: checkboxes
+    attributes:
+      label: "Documentation is:"
+      options:
+        - label: Missing or needed?
+        - label: Confusing
+        - label: Not sure?
+
+  - type: textarea
+    attributes:
+      label: Please Explain in Detail
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Your Proposal for Changes
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000..1e2d689
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,31 @@
+name: Feature Request
+description: Suggest an idea
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Most features should start as plugins outside of sunflower theme.
+        Please consider whether your changes are useful for all users, or if this is specific to your usecase and the use of a plugin would be more appropriate.
+        
+        Need help or support?
+        Please don't open an issue! Head to https://chatbegruenung.de/channel/sunflower-wordpress or https://verdigado.com/kontakt/.
+
+  - type: textarea
+    attributes:
+      label: Feature Proposal
+      description: |
+        What are you trying to accomplish?
+        Providing context helps us come up with a solution that is most useful in the real world
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Website or Screenshots
+      description: If applicable, add a link to the website or add screenshots to help explain your problem.
+
+  - type: textarea
+    attributes:
+      label: Possible Implementation
+      description: Not obligatory, but suggest ideas for how to implement the addition or change