diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 6d670c46..4df972e0 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,20 +1,31 @@
 <!-- Provide a general summary of the issue in the title above. -->
-<!-- Issues are for reporting bugs or problems only. If you have a feature request, please write in the forums. -->
-<!-- Did you already have a look into our FAQ page at https://github.com/it0uchpods/IDG-A32X/blob/master/FAQ.md ? -->
 
-### Expected Behavior
+### General
+----
+<!-- [ ] = Unchecked, [x] = Checked. -->
+I am submitting a: (select one) 
+* [x] Bug report
+* [ ] Feature request
+
+### Details
+----
+#### Expected Behavior (bug reports)
 <!-- Tell us what should happen. -->
 
-### Current Behavior
+#### Current Behavior (if applicable)
 <!-- Tell us what happens instead of the expected behavior. -->
 
-### Possible Solution
+#### Requested Behavior  (feature requests)
+<!-- Tell us what you want to happen -->
+
+#### Possible Solution (if applicable)
 <!-- Think you have a solution? Let us know! -->
 
-### Steps to Reproduce
+#### Steps to Reproduce (bug reports)
 <!-- Provide a link to a live example, or a set of steps to reproduce -->
-<!-- this bug. Issue will be closed/ignored if missing. -->
-1.
-2.
-3.
-4.
\ No newline at end of file
+<!-- this bug. Bug reports will be closed/ignored if missing. -->
+1. 
+2. 
+3. 
+4. 
+5. 
\ No newline at end of file