diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d00ae668..80d2e933 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,31 +1,43 @@
---
name: Bug report
-about: Is something not working as expected? Fill out the template and I'll see what I can do!
-title: "[BUG]"
+about: Is something not working as expected? Please provide as much information as possible, and I'll see what I can do!
+title: "[BUG] "
labels: Bug
assignees: NikkelM
---
**Describe the bug**
-A clear and concise description of what the bug is.
+Please give a clear and concise description of the bug you encountered, and what you expected to happen instead.
+If applicable, please include the complete contents of the error pop-up.
+
+**Relevant YouTube channel**
+If this bug is related to a specific YouTube channel, please provide a link to the channel here, or if the bug occurs on a specific video, a link to the video.
+Channel link:
+Video link:
+
+If applicable to your bug, please check the relevant boxes below:
+- [ ] This bug only occurs on the channel/video specified above.
+- [ ] This bug occurs on *all* channels/videos.
+
+- [ ] This bug *only* occurs when using the shuffle button on the pop-up.
+- [ ] This bug *also* occurs when using the shuffle button on the pop-up.
+
+- [ ] I *have* tried if the bug also occurs when using a different browser (please specify all browsers you tried in the section below).
**To Reproduce**
-Steps to reproduce the behaviour:
-1. Go to '...'
-2. Click on '....'
+Steps to reproduce the behaviour, e.g.:
+1. Go to the channel/video page
+2. Click the 'Shuffle' button
3. See error
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
+**Software information:**
+Providing this information will help me to reproduce the bug, and fix it faster.
+ - Extension Version [e.g. 2.2.0, Check the `Changelog` page linked in the extension pop-up for the version number]:
+ - Browser [e.g. Chrome, Firefox, Opera]:
+
+**Additional context**
+Add any other context about the problem here, e.g. if the bug only occurs with specific settings enabled.
**Screenshots**
If applicable, add screenshots to help explain your problem.
-
-**Software information(please complete the following information):**
- - Extension Version [e.g. 0.0.2]:
- - Browser [e.g. Chrome, Safari]:
- - Browser Version [e.g. 22]:
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 4231fee3..79e2f0c5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,14 +1,16 @@
---
name: Feature request
about: Suggest an idea for this project.
-title: "[FEATURE]"
+title: "[FEATURE] "
labels: Feature
assignees: NikkelM
---
+- [ ] I have made sure that an issue for this feature does not already exist.
+
**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is. E.g. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
@@ -18,3 +20,6 @@ A clear and concise description of any alternative solutions or features you've
**Additional context**
Add any other context or screenshots about the feature request here.
+
+**Screenshots**
+If applicable, add screenshots or mock-ups to help explain your feature request.
diff --git a/static/html/changelog.html b/static/html/changelog.html
index ad5503df..975ae68b 100644
--- a/static/html/changelog.html
+++ b/static/html/changelog.html
@@ -74,8 +74,9 @@