diff --git a/.gitlab/issue_templates/Bug report.md b/.gitlab/issue_templates/Bug report.md
index 1515dda..e544a3a 100644
--- a/.gitlab/issue_templates/Bug report.md	
+++ b/.gitlab/issue_templates/Bug report.md	
@@ -16,5 +16,5 @@
 1.
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"bug::not confirmed"
diff --git a/.gitlab/issue_templates/Feature request.md b/.gitlab/issue_templates/Feature request.md
index 3d85e92..d57c5d0 100644
--- a/.gitlab/issue_templates/Feature request.md	
+++ b/.gitlab/issue_templates/Feature request.md	
@@ -3,5 +3,5 @@
 <!-- Describe as precisely as possible the feature you want to be added: how should it work? What does it do? -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"feature::request"
diff --git a/.gitlab/issue_templates/Suggestion.md b/.gitlab/issue_templates/Suggestion.md
deleted file mode 100644
index 20440d6..0000000
--- a/.gitlab/issue_templates/Suggestion.md
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- This is for general discussion on the extension. For specific issues (bug report, theme request, feature request), please use the appropriate template. -->
-
-
-<!-- Don't remove this line -->
-/label ~discussion
diff --git a/.gitlab/issue_templates/Theme request.md b/.gitlab/issue_templates/Theme request.md
index b399fec..f0ea923 100644
--- a/.gitlab/issue_templates/Theme request.md	
+++ b/.gitlab/issue_templates/Theme request.md	
@@ -3,5 +3,5 @@
 - Theme name:
 - Theme repository or download link:
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"theme::request"
diff --git a/.gitlab/merge_request_templates/Bug fix - WIP.md b/.gitlab/merge_request_templates/Bug fix - WIP.md
index f8ac2bb..38e5d05 100644
--- a/.gitlab/merge_request_templates/Bug fix - WIP.md	
+++ b/.gitlab/merge_request_templates/Bug fix - WIP.md	
@@ -1,9 +1,7 @@
-<!--
-Start your MR title with "WIP: " and indicate:
-	- what it does
-	- which issue it fixes by adding "(Fix #[issue number])"
--->
+<!-- Start your MR title with "WIP: " and indicate what it does -->
+
+<!-- Indicate which issue your MR fixes by adding "Fix #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"bug::WIP"
diff --git a/.gitlab/merge_request_templates/Bug fix.md b/.gitlab/merge_request_templates/Bug fix.md
index bb4b84a..e09dcd7 100644
--- a/.gitlab/merge_request_templates/Bug fix.md	
+++ b/.gitlab/merge_request_templates/Bug fix.md	
@@ -1,9 +1,7 @@
-<!--
-Indicate in your MR title:
-	- what it does
-	- which issue it fixes by adding "(Fix #[issue number])"
--->
+<!-- Indicate in your MR title what it does -->
+
+<!-- Indicate which issue your MR fixes by adding "Fix #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"bug::fixed"
diff --git a/.gitlab/merge_request_templates/New feature - WIP.md b/.gitlab/merge_request_templates/New feature - WIP.md
index cab5149..4216660 100644
--- a/.gitlab/merge_request_templates/New feature - WIP.md	
+++ b/.gitlab/merge_request_templates/New feature - WIP.md	
@@ -1,9 +1,7 @@
-<!--
-Start your MR title with "WIP: " and indicate:
-	- which new feature it implements
-	- to which issue it relates (if any) by adding "(Fix #[issue number])"
--->
+<!-- Start your MR title with "WIP: " and indicate which new feature it implements -->
+
+<!-- Indicate to which issue it relates (if any) by adding "Implements #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"feature::WIP"
diff --git a/.gitlab/merge_request_templates/New feature.md b/.gitlab/merge_request_templates/New feature.md
index fed8016..153a8e8 100644
--- a/.gitlab/merge_request_templates/New feature.md	
+++ b/.gitlab/merge_request_templates/New feature.md	
@@ -1,9 +1,7 @@
-<!--
-Indicate in your MR title:
-	- which new feature it implements
-	- to which issue it relates (if any) by adding "(Fix #[issue number])"
--->
+<!-- Indicate in your MR title which new feature it implements -->
+
+<!-- Indicate to which issue it relates (if any) by adding "Implements #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"feature::implemented"
diff --git a/.gitlab/merge_request_templates/New theme support - WIP.md b/.gitlab/merge_request_templates/New theme support - WIP.md
index 0a404f5..68fc62c 100644
--- a/.gitlab/merge_request_templates/New theme support - WIP.md	
+++ b/.gitlab/merge_request_templates/New theme support - WIP.md	
@@ -1,9 +1,7 @@
-<!--
-Start your MR title with "WIP: " and indicate:
-	- the name of the theme it implements
-	- to which issue it relates (if any) by adding "(Fix #[issue number])"
--->
+<!-- Start your MR title with "WIP: " and indicate the name of the theme it implements -->
+
+<!-- Indicate to which issue it relates (if any) by adding "Implements #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"theme::WIP"
diff --git a/.gitlab/merge_request_templates/New theme support.md b/.gitlab/merge_request_templates/New theme support.md
index d51cc0a..0bb22f7 100644
--- a/.gitlab/merge_request_templates/New theme support.md	
+++ b/.gitlab/merge_request_templates/New theme support.md	
@@ -1,9 +1,7 @@
-<!--
-Indicate in your MR title:
-	- the name of the theme it implements
-	- to which issue it relates (if any) by adding "(Fix #[issue number])"
--->
+<!-- Indicate in your MR title the name of the theme it implements -->
+
+<!-- Indicate to which issue it relates (if any) by adding "Implements #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"theme::implemented"
diff --git a/.gitlab/merge_request_templates/Translation - WIP.md b/.gitlab/merge_request_templates/Translation - WIP.md
index 6d7c17a..30e61da 100644
--- a/.gitlab/merge_request_templates/Translation - WIP.md	
+++ b/.gitlab/merge_request_templates/Translation - WIP.md	
@@ -1,9 +1,7 @@
-<!--
-Start your MR title with "WIP: " and indicate:
-	- the language
-	- to which issue it relates (if any) by adding "(Fix #[issue number])"
--->
+<!-- Start your MR title with "WIP: " and indicate the language of the translation -->
+
+<!-- Indicate to which issue it relates (if any) by adding "Closes #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"translation::WIP"
diff --git a/.gitlab/merge_request_templates/Translation.md b/.gitlab/merge_request_templates/Translation.md
index 75cc28f..9078161 100644
--- a/.gitlab/merge_request_templates/Translation.md
+++ b/.gitlab/merge_request_templates/Translation.md
@@ -1,9 +1,7 @@
-<!--
-Indicate in your MR title:
-	- the language
-	- to which issue it relates (if any) by adding "(Fix #[issue number])"
--->
+<!-- Indicate in your MR title the language of the translation -->
+
+<!-- Indicate to which issue it relates (if any) by adding "Closes #[issue number]" -->
 
 
-<!-- Don't remove this line -->
+<!-- Don't remove the following line -->
 /label ~"translation::updated"