diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5c3c12385..9950af26d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+**Does it happen in OpenBoard, or is it exclusive to this modified version?**
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -23,6 +25,9 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**App version**
+Which exact version of this fork is affected?
+
 **Smartphone (please complete the following information):**
  - Device: [e.g. Samsung Galaxy S9]
  - OS: [e.g. Android 10]
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 11fc491ef..7d0d1b3f3 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,12 +7,19 @@ assignees: ''
 
 ---
 
+<!--
+Note that this version of OpenBoard is focusing only on a few things. You can add a feature request, but at the current stage it's unlikely it will get implemented.
+-->
+
 **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 [...]
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Use case**
+Provide a clear and concise description of *your use case* and what you thus think is missing, and why.
+
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
diff --git a/.github/ISSUE_TEMPLATE/new-keyboard-layout-request.md b/.github/ISSUE_TEMPLATE/new-keyboard-layout-request.md
deleted file mode 100644
index 3e6bd5918..000000000
--- a/.github/ISSUE_TEMPLATE/new-keyboard-layout-request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: New keyboard layout request
-about: Use this to propose a new layout
-title: "*insert here layout name* layout"
-labels: layout
-assignees: ''
-
----
-
-Add here references to the layout (links or screenshots).
diff --git a/.github/ISSUE_TEMPLATE/new-language-request.md b/.github/ISSUE_TEMPLATE/new-language-request.md
index 145375bea..9c9e752f8 100644
--- a/.github/ISSUE_TEMPLATE/new-language-request.md
+++ b/.github/ISSUE_TEMPLATE/new-language-request.md
@@ -8,3 +8,6 @@ assignees: ''
 ---
 
 
+<!--
+Check if the language is already included in the downloadable dictionaries at https://github.com/Helium314/openboard/tree/new/dictionaries/dict
+-->