diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug.md
similarity index 85%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug.md
index cf8ea67..8421872 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,8 +1,14 @@
+---
+name: "Bug Report"
+about: "NERDTree is misbehaving? Tell us about it."
+labels: bug
+---
+
 # Attention! Please Read!
 
 Please fill out **ALL the information** below so that the issue can be fully understood. Omitting information will delay the resolution of your issue. It will be labeled **`Needs More Info`**, and *may* be closed until there is enough information.
 
-Keep in mind that others may experience the same issue in the future. The better your information, the more likely they'll be able to answer they're own question.
+Keep in mind that others may have the same question in the future. The better your information, the more likely they'll be able to help themselves.
 
 After reading, and before submitting your issue, please remove this introductory text.
 
@@ -14,11 +20,6 @@ After reading, and before submitting your issue, please remove this introductory
 - [ ] I have reviewed the [Wiki](https://github.com/scrooloose/nerdtree/wiki).
 - [ ] I have searched the web for an answer to my question.
 
-#### Issue Type
-- [ ] General Question (Setup, How-To, etc.)
-- [ ] Feature Request
-- [ ] Bug Report
-
 #### Environment (for bug reports)
 - [ ] Operating System: 
 - [ ] Vim/Neovim version `:version`: 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..35db0f6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,8 @@
+---
+name: "Feature Request"
+about: "What new feature are you requesting for NERDTree?"
+labels: "feature request"
+---
+
+#### Description
+
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000..12ed8e6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,24 @@
+---
+name: "General Question"
+about: "Having trouble setting up NERDTree? Need clarification on a setting? Ask your question here."
+labels: "general question"
+---
+
+# Attention! Please Read!
+
+Please fill out **ALL the information** below so that the issue can be fully understood. Omitting information will delay the resolution of your issue. It will be labeled **`Needs More Info`**, and *may* be closed until there is enough information.
+
+Keep in mind that others may have the same question in the future. The better your information, the more likely they'll be able to help themselves.
+
+After reading, and before submitting your issue, please remove this introductory text.
+
+──────────────────── ✄ ────────────────────
+
+#### Self-Diagnosis
+- [ ] I have searched the [issues](https://github.com/scrooloose/nerdtree/issues) for an answer to my question.
+- [ ] I have reviewed the NERDTree documentation. `:h NERDTree`
+- [ ] I have reviewed the [Wiki](https://github.com/scrooloose/nerdtree/wiki).
+- [ ] I have searched the web for an answer to my question.
+
+#### State Your Question
+