diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9c3768a..c4ab045 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,25 +23,21 @@ about: Report bugs of PlaceholderAPI with this template
 ## Bug Report
 
 ### Issue
-> What is the issue? Describe it like you would tell a friend.
-<!-- Please write below this line to prevent formatting issues -->
+<!-- What is the issue? Describe it like you would tell a friend. -->
 
 
 ### Expected behaviour
-> What should PlaceholderAPI do?
-<!-- Please write below this line to prevent formatting issues -->
+<!-- What should PlaceholderAPI do? -->
 
 
 ### Actual behaviour
-> What does PlaceholderAPI actually do?
-<!-- Please write below this line to prevent formatting issues -->
+<!-- What does PlaceholderAPI actually do? -->
 
 
 ### How to reproduce
-> What steps did you made, to get this bug?
-<!-- Please write below this line to prevent formatting issues -->
+<!-- What steps did you made, to get this bug? -->
+
 1. 
 
-### Installed expansions
-> Please list all expansions that are displayed when running `/papi list`
-<!-- Please write below this line to prevent formatting issues -->
+### `/papi dump` output
+<!-- Please provide the URL that was generated when using /papi dump -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0e16cfa..c66b3e4 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,10 +15,9 @@ about: Request a update/change of the PlaceholderAPI-code
 ## Feature Request
 
 ### Type
-> What kind of request is this? (Multiple selections possible)
-<!--
-      Please select the right options by replacing the [ ] with a [x]
--->
+<!-- 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).  
@@ -27,7 +26,6 @@ Changes to code that won't affect the end-user.
 Changes to code that will affect the end-user (breaks stuff).
 - [ ] Other: __________ <!-- Use this if none of the above matches your request -->
 
-### Info
-> What is the change?  
-> Please provide as much information (including links, images and code-snippeds) as possible.
-<!-- Please write below this line to prevent formatting issues -->
+### 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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f0bd977..87244dc 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,13 @@
-## Please read
-Please make sure you checked the following:
-- You checked the [Pull requests] page for any upcoming changes.
-- You documented any public code that the end-user might use.
-- You followed the [contributing file] 
+<!--
+  ### Please read ###
+  Please make sure you checked the following:
+
+  - You checked the Pull requests page for any upcoming changes.
+  - You documented any public code that the end-user might use.
+  - You followed the contributing file (https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/.github/CONTRIBUTING.md).
+-->
+
+## Pull Request
 
 ### Type
 <!--
@@ -14,12 +19,10 @@ Please make sure you checked the following:
 - [ ] Other: __________ <!-- Use this if none of the above matches your request -->
 
 ### Description
-> Provide additional information if needed.
-<!-- Please type below this line -->
+<!-- What does your Pull request change? -->
+
+Closes N/A <!-- If your PR is based on an issue, change "N/A" the the issue ID (#id) -->
 
 
 <!-- DO NOT ALTER ANYTHING BELOW THIS LINE! -->
-
-[Pull requests]: https://github.com/PlaceholderAPI/PlaceholderAPI/pulls
-[contributing file]: https://github.com/PlaceholderAPI/PlaceholderAPI/tree/master/.github/CONTRIBUTING.md
 [Wiki]: https://github.com/PlaceholderAPI/PlaceholderAPI/wiki