diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 614de1c9..5265bea4 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,20 +1,78 @@
-###### What version of Jekyll are you using (`jekyll -v`)?
+<!--
+  Hi! Thanks for considering to file a bug with Jekyll.  Please take the time to
+  answer the basic questions. You can convert `[ ]` into `[x]` to check boxes (or submit
+  and check.) If there is no need for certain fields like output and redirection, please delete
+  those headers before submitting.  We know not all tickets require those steps.
+  Otherwise, please try to be as detailed as possible.
+  
+  If you are unsure this is a bug in Jekyll, or this is a bug caused
+  by a plugin that isn't directly related to Jekyll, or if this is just
+  a generic usage question, please consider asking your question at
+  https://talk.jekyllrb.com where non-bug questions go.
+  
+  Thanks!
+-->
 
+- [ ] I believe this to be a bug, not a question about using Jekyll.
+- [ ] I Updated to the latest Jekyll (or) if on Github Pages to the latest `github-pages`
+- [ ] I Read the CONTRIBUTION file at https://jekyllrb.com/docs/contributing/
+- [ ] This is a feature request.
 
+---
 
-###### What operating system are you using?
+- [ ] I am on (or have tested on) ***Mac OS*** 10+
+- [ ] I am on (or have tested on) ***Debian/Ubuntu*** GNU/Linux
+- [ ] I am on (or have tested on) ***Fedora*** GNU/Linux
+- [ ] I am on (or have tested on) ***Arch*** GNU/Linux
+- [ ] I am on (or have tested on) ***Other*** GNU/Linux
+- [ ] I am on (or have tested on) ***Windows*** 10+
 
+<!--
+  Other GNU/Linux includes Scientific GNU/Linux, CentOS GNU/Linux, and others.
+  If you are on a minor sub-distro (such as ElementaryOS which does not diverge from
+  Ubuntu much, please check the parent distro. Kubuntu, Edubuntu, Lubuntu should
+  also be flagged as Ubuntu as their packages come from upstream Ubuntu.
+-->
 
+---
 
-###### What did you do?
-(Please include the content causing the issue, any relevant configuration settings, and the command you ran)
+- [ ] I was trying to install.
+- [ ] There is a broken Plugin API.
+- [ ] I had an error on Github Pages, and I have not tested locally.
+- [ ] I had an error on Github Pages, and Github Support said it was a Jekyll Bug.
+- [ ] I had an error on Github Pages and I did not test it locally.
+- [ ] I was trying to build.
+- [ ] It was another bug.
 
+## My Reproduction Steps
 
+<!--
+  If this error occured on Github Pages, please try to provide us with logs,
+  and look at them yourself, to determine if this is an actual Jekyll bug. In
+  the event you are unsure, file a ticket, however, when you do please provide
+  the logs (strip them of personal information.)
+  
+  If you have trouble finding your logs, please email support@github.com and
+  they will happily help you. If you cannot find logs, please try your best to
+  replicate it locally because we cannot fix a problem if we do not know
+  exactly what caused it, or within a relatively close distance.
+-->
 
-###### What did you expect to see?
+<!--
+  Insert the steps you took to for this problem to exist. Such as the
+  directories you created and, the full command you ran, and include any
+  plugins you have installed, this is very important.
+  
+  If your steps are complicated, you can also submit a Github
+  repository (please no zips, they will be removed and rejected by maintainers,)
+  and just supply a command for us to reproduce it ourselves.
+-->
 
+## The Output I Wanted
 
-
-###### What did you see instead?
-
+<!-- 
+  Insert the output from the command. Alter it as little as you can.
+  The minimum should be personal information. Though we normally don't log
+  anything like that so there should be no need to alter it.
+-->