diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 97b4dd0..f6b3c1e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,26 +8,27 @@ assignees: ''
 ---
 
 ## Bug description
+<!-- A short summary of the issue. You can also explain how it affected you or explain some background of the story. -->
 
 ## Steps to reproduce
-
-Steps to reproduce the behavior:
+<!-- Describe what steps you did/can do to reproduce the problem. Also mention if it is not always reproducible. If applicable, add screenshots to help explain your problem. -->
 
 1. 
 2. 
 3. 
 
-**Actual behavior:**
-<!-- The behavior you saw. -->
+### Actual behavior
+<!-- The behavior you experienced. -->
 
-**Expected behavior:**
+### Expected behavior
 <!-- A clear and concise description of what you expected to happen. -->
 
-**Screenshots**
-<!-- If applicable, add screenshots to help explain your problem. -->
-
 ## System
+<!-- Add some information about your system. You can omit values if you think they are really not necessary. -->
 
-Operation system and version: 
+Operating system and version: 
 Browser and version: Firefox 
-Add-on version:
+Add-on version: 
+
+## Possible solution
+<!-- Add references to other issues/docs/websites here or look into the code to find the potential causes of the problem or how to fix it. Omit this, if you don't know what to write here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index dbe119e..369f58f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -12,11 +12,11 @@ assignees: ''
 <!-- A clear and concise description of what the problem is. E.g.: "I'm always frustrated when […]" -->
 
 ## Proposed solution
-<!-- Describe the solution you'd like -->
+<!-- Describe the solution you'd like. -->
 <!-- A clear and concise description of what you want to happen. -->
 
 ## Alternatives
-<!-- Describe alternatives you've considered -->
+<!-- Describe alternatives you've considered. -->
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 ## Additional context