diff --git a/.github/ISSUE_TEMPLATE/-bug--bug-report.md b/.github/ISSUE_TEMPLATE/-bug--bug-report.md
index cdb91fa0..6e5ff660 100644
--- a/.github/ISSUE_TEMPLATE/-bug--bug-report.md
+++ b/.github/ISSUE_TEMPLATE/-bug--bug-report.md
@@ -6,27 +6,30 @@ labels: bug
 assignees: Zagrios
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+## Bug Description
+<!-- A clear and concise description of what the bug is. -->
 
-**To Reproduce**
-Steps to reproduce the behavior:
+## Reproduction Steps
+<!-- Steps to reproduce the behavior:
 
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
+-->
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+## Expected Behavior
+<!-- A clear and concise description of what you expected to happen. -->
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+## Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
 
-**Desktop (please complete the following information):**
+## System Specs
+<!-- **Desktop (please complete the following information):**
 
 -   OS: [e.g. iOS]
 -   Version [e.g. 22]
+-->
 
-**Additional context**
-Add any other context about the problem here.
+## Additional context
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/-feat---feature-request.md b/.github/ISSUE_TEMPLATE/-feat---feature-request.md
index 19c6b5da..c2f66895 100644
--- a/.github/ISSUE_TEMPLATE/-feat---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/-feat---feature-request.md
@@ -6,14 +6,17 @@ labels: enhancement
 assignees: Zagrios
 ---
 
-**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 [...]
+## Problem
+<!-- **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.
+## Solution
+<!-- **Describe the solution you'd like** -->
+<!-- A clear and concise description of what you want to happen. -->
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+## Alternative solutions (if any)
+<!-- **Describe alternatives you've considered** -->
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+## Additional context
+<!-- Add any other context or screenshots about the feature request here. -->