diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index d453c6c..1b49280 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,58 +4,39 @@ about: Create a report to help us fix something that is broken
 title: ''
 labels: Bug
 assignees: PHLAK
-
 ---
 
 **Directory Lister Version**
 
-The version of directory lister you're using.
-
-Examples: `v2.7.1` or `v3.0.0-beta.1`
-
-_Reminder: Directory Lister 2.X is no longer being supported_
+<!-- What version of Directory Lister are you using? -->
 
 **PHP Version**
 
-What version of PHP do you have installed?
-
-Run `php --version` from a command line to find your version.
-
-_Reminder: Directory Lister requires PHP 7.2+_
-
+<!-- What version of PHP do you have installed? -->
+<!-- Run `php --version` from a command line to find your version -->
+<!-- Reminder: Directory Lister requires PHP 7.2+ -->
 
 **PHP Extensions**
 
-What PHP extensions do you have installed?
-
-Run `php -m` from a command line and paste the output here.
-
+<!-- What PHP extensions do you have installed? -->
+<!-- Run `php -m` from a command line and paste the output here -->
 
 **HTTP Server**
 
-What HTTP server are you using to serve Directory Lister?
-
-Examples: Apache, NGINX, Lighttpd, etc.
-
+<!-- What HTTP server are you using to serve Directory Lister? Examples: Apache, NGINX, etc. -->
 
 **Describe the bug**
 
-A description of the observed behavior.
-
+<!-- A description of the observed behavior -->
 
 **Steps To Reproduce**
 
-  1. Do something...
-  2. Followed by something else...
-  3. Then do another thing...
-  4. See error
-
+<!-- The steps required to reproduce the error -->
 
 **Expected behavior**
 
-A description of what you expected to happen.
-
+<!-- What did you expect to happen instead? -->
 
 **Additional context**
 
-Add any other context about the problem. Error logs would be very helpful here.
+<!-- Add any other context about the problem. Error logs would be helpful here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ff01609..69ada27 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,24 +4,20 @@ about: Suggest a new feature or improvement to existing functionality
 title: ''
 labels: Enhancement
 assignees: PHLAK
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
 
-A description of what the problem is. Ex. I'm always frustrated when...
-
+<!-- A description of what the problem is. Ex. I'm always frustrated when... -->
 
 **Describe the solution you'd like**
 
-A description of what you want to happen.
-
+<!-- Describe what you want to happen -->
 
 **Describe alternatives you've considered**
 
-A description of any alternative solutions or features you've considered.
-
+<!-- HAve you considered any alternative solutions or features? -->
 
 **Additional context**
 
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 4fa4b56..72f68d5 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -4,7 +4,6 @@ about: Ask a question for more information
 title: ''
 labels: Question
 assignees: PHLAK
-
 ---
 
-Ask your question. Please provide as much detail as possible.
+<!-- Ask your question. Please provide as much detail as possible. -->