diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 32fa3e03e..d4e0ea9b7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -16,9 +16,10 @@ To make it easier for us to help you please enter detailed information below.
 
 Please note, we only support the latest version of NewPipe and
 master branch. Please make sure to upgrade & recreate the issue on the latest
-version prior to opening an issue. The release page (https://github.com/TeamNewPipe/NewPipe/releases/latest) is a good start, make sure its version is the same as in you app (left sidebar, about)
+version prior to opening an issue. The release page (https://github.com/TeamNewPipe/NewPipe/releases/latest) is a good start, make sure its version is the same as in you app (To check you version, press on the three line menu on the left, click on "About", and you will see your current version.)
 -->
 ### Steps to reproduce
+<!--If you cant reproduce it, please try and give as many details as possible how you think you got to the bug-->
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Press on '....'
@@ -34,5 +35,6 @@ Tell us what happens instead
 If applicable, add screenshots or a screen recording to help explain your problem. Github should support uploading them directly in the issue field. If your file is too big, feel free to paste a link from a image/video hoster here instead.
 
 ### Logs
-If your bug includes a crash, please head over to the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/). Copy the result. Paste it between the code tags:
-<code>here</code>
+If your bug includes a crash, please head over to the [incredible bugreport to markdown converter](https://teamnewpipe.github.io/CrashReportToMarkdown/). Copy the result. Paste it here:
+
+<!--Thats right, here-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index a0bde3dc0..e39fc5f07 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -22,3 +22,8 @@ Ex. *I considered Z, but that didn't work because...*
 #### Additional context
 Add any other context or screenshots about the feature request here.
 Ex. *Here's a photo of my cat!*
+
+#### Why do you/everyone wants this feature
+Convince us! How does it change your NewPipe experience and/or your life?
+The better this paragraph is, the more likely a developer will think about developing it
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ea06e601a..570d07778 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,19 @@
-<!-- Hey there. Thank you so much for improving our app. Please take a moment to fill out the following suggestion on how to structure this PR description. Having roughly the same layout drastically helps everyoby :)-->
+<!-- Hey there. Thank you so much for improving our app. Please take a moment to fill out the following suggestion on how to structure this PR description. Having roughly the same layout drastically helps everybody :)-->
 
-#### long description of the changes in your PR
+#### What is it?
+- [ ] Bug fix
+- [ ] Feature
+
+#### Long description of the changes in your PR
 *Now you can make videos*
 
 #### Fixes the following issue(s)
 <!--Also add reddit or other links where you change is related-->
-- #1234
+- 
 
 #### Relies on the following changes
-<!-- Delete this if it doesnt apply to you -->
-- #1234
+<!-- Delete this if it doesn't apply to you -->
+- 
 
 #### Testing apk
 <!--Please add ".branchname" at the end of the app signature, only if the current branch name is not "master" or "dev".-->