diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..f8c65b9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,86 @@
+name: Bug Report
+description: Found a Bug about PlaceholderAPI? Use this template to report it!
+issue_body: false
+body:
+- type: markdown
+  attributes:
+    value: |-
+      Thank you for opening a bug report. In order to process the Report efficiently and to also help you with it in the process do we require some specific information from you.
+      Please make sure to always use the latest Release on Spigot, or the latest Development release from our Jenkins Server.
+      
+      Spigot: https://www.spigotmc.org/resources/6245/
+      Jenkins: http://ci.extendedclip.com/job/PlaceholderAPI/
+      
+      **DO NOT REPORT ISSUES WITH EXPANSIONS AND/OR PLACEHOLDERS. USE THE APPROPRIATE ISSUE TRACKER FOR THOSE!**
+- type: checkboxes
+  attributes:
+    label: Confirmation
+    description: Please make sure to have followed the following checks.
+    options:
+      - label: My issue isn't already found on the Issue tracker.
+        required: true
+      - label: My issue is about **PlaceholderAPI** and not any expansion or external plugin
+        required: true
+- type: dropdown
+  attributes:
+    label: "Type"
+    description: "What type of bug do you encounter?"
+    multiple: false
+    options:
+      - Plugin Bug
+      - API Bug
+      - Plugin/Server Incompatability
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "What happens?"
+    description: "What bug are you encountering? Try to explain it as detailed as possible."
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Expected Behaviour"
+    description: "What behaviour did you expect from PlaceholderAPI?"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Actual Behaviour"
+    description: "How does PlaceholderAPI behave instead?"
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "How to Reproduce"
+    description: |-
+      List the steps on how to reproduce this Bug.
+      Post any Code-examples in the `Additional Info` field below when you selected `API Bug`.
+    placeholder: |-
+      1. Do this
+      2. ...
+      3. Profit!
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: "`/papi dump` Output"
+    description: "Paste the output of `/papi dump` in the field below. It includes a lot of useful information for us."
+    placeholder: "https://paste.helpch.at/dump.log"
+  validations:
+    required: true
+- type: input
+  attributes:
+    label: "Errors"
+    description: "Post links to any Stacktraces or Errors PlaceholderAPI printed. We recommend using https://paste.helpch.at, https://paste.gg or any other hastebin/Pastebin-like site."
+    placeholder: "https://paste.helpch.at/error.log"
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: "Additional Info"
+    description: |-
+      Add any extra info you think is nessesary for this Bug report.
+      - If you selected `API Bug` will you need to include code-examples here to reproduce the issue.
+      - If you selected `Plugin/Server Incompatability` should you include extra Server info such as a Timings or Spark-Report or info about the plugin in question.
+    placeholder: "Put any extra info you like into this field..."
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index c66b3e4..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Feature Request
-about: Request a update/change of the PlaceholderAPI-code
-
----
-
-<!--
-  ### Please read ###
-  Before suggesting any new features, make sure that it wasn't suggested before and that no open issue with it exists already.
-
-  If possible would we suggest to create a Pull request instead.
-  When doing so, make sure to follow our Contributing Guidelines: https://github.com/PlaceholderAPI/PlaceholderAPI/blob/master/.github/CONTRIBUTING.md
--->
-
-## Feature Request
-
-### Type
-<!-- What kind of request is this? (Multiple selections possible) -->
-<!-- To select an option change the [ ] to [x] -->
-
-- [ ] New function for PlaceholderAPI.  
-A new function that developers could use.
-- [ ] Change to code (Internal).  
-Changes to code that won't affect the end-user.
-- [ ] Change to code (External).  
-Changes to code that will affect the end-user (breaks stuff).
-- [ ] Other: __________ <!-- Use this if none of the above matches your request -->
-
-### Description
-<!-- Describe what this suggested change should do and why it would be useful -->
-<!-- When possible, add some code-examples to better illustrate the change -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..976a6b8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,60 @@
+---
+name: Feature Request
+about: Suggest a new Feature for PlaceholderAPI
+labels: 'Type: Enhancement'
+body:
+- type: markdown
+  attributes:
+    value: |-
+      Thank you for opening a Feature request.
+      Please make sure you first checked for any existing issue (either open or closed), Discussion or Pull request about your suggestion.
+      If it doesn't exist, proceed.
+      
+      Note that any suggestions towards a specific Expansion should be made on that expansion's repository and not here!
+- type: checkboxes
+  attributes:
+    label: Confirmation
+    description: Please make sure to have followed the following checks.
+    options:
+      - label: I checked the Issue tracker and any Open PRs for my idea.
+        required: true
+      - label: My idea is for **PlaceholderAPI** and not any expansion or other plugin.
+        required: true
+- type: dropdown
+  attributes:
+    label: "Type"
+    description: "What type is your Suggestion? Select all that match."
+    multiple: true
+    options:
+      - New API feature
+      - New config option
+      - Minor Code improvement (Won't affect Servers)
+      - Major Code improvement (Will affect Servers)
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Description"
+    description: |-
+      Give a detailed explanation about your suggestion and why it would be beneficial for PlaceholderAPI.
+      Just saying "It's cool!" or "I need it" aren't valid reasons, as it should also benefit other users and not just you.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: "Code Example"
+    description: "Do you have any Code Examples that you could show us?"
+  validations:
+    required: false
+- type: input
+  attributes:
+    label: "Jar file"
+    description: "If you already have a Jar file with those suggested features, provide it as download link here. Set 'N/A' if you don't have a jar file available."
+    placeholder: "https://cdn.discordapp.com/..."
+  validations:
+    required: true
+- type: markdown
+  attributes:
+    value: |-
+      Add any extra info you think is nessesary for this Feature request.
+      - When you selected `Major Code improvement (Will affect Servers)` should you mention what will break when people update.