diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/bug_report.md
similarity index 80%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/bug_report.md
index 947ccfb..e1b8318 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,10 +1,15 @@
+---
+name: "Bug Report"
+about: "Is something not working as expected?"
+---
+
 <!--
   Before opening a new issue please:
   
-  - Verify you have the latest versions of Jekyll and Basically Basic
+  - Verify you have the latest versions of Jekyll and Basically Basic 
     installed by running `bundle update`.
   - Thoroughly read the theme's documentation at
-    https://github.com/mmistakes/jekyll-theme-basically-basic/blob/master/README.md
+    https://github.com/mmistakes/jekyll-theme-basically-basic
   - Search all issues at https://github.com/mmistakes/jekyll-theme-basically-basic/issues 
     for solutions and to avoid duplication.
   - Ask for help at https://talk.jekyllrb.com/
@@ -12,12 +17,6 @@
   After exhausting these suggestions use the format below.
 -->
 
-## Description
-
-<!--
-  Describe the issue or proposed feature enhancement.
--->
-
 ## Environment
 
 <!--
@@ -34,15 +33,14 @@
 - Ruby gem or remote theme version:
 - Jekyll version:
 - Git repository URL:
-- Operating system:
 - GitHub Pages hosted (if yes provide URL to site):
-
----
+- Operating system:
 
 ## Expected behavior
 
 <!--
-  Describe the intended output or what you expected to see.
+  What is it you expected to happen? This should be a description of how the
+  functionality you tried to use is supposed to work.
 -->
 
 ## Steps to reproduce the behavior
@@ -61,3 +59,10 @@
 
   Screenshots can also be included if they help illustrate a behavior.
 -->
+
+## Other
+
+<!--
+  NOTE: Please provide a code repository, gist, code snippet, sample files, 
+  screenshots, or anything else you think will aid in reproducing the issue.
+-->
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 0000000..25f111f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,16 @@
+---
+name: "Documentation"
+about: "Found a typo or something that needs clarification?"
+---
+
+<!-- Thanks for taking the time to open an issue and help make the docs better -->
+
+## Motivation
+
+<!-- Why should we update our docs? -->
+
+<!-- What should we do instead? -->
+
+## Suggestion
+
+<!-- What should we do instead? -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..c4aefd0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,33 @@
+---
+name: "Enhancement / Feature Request"
+about: "What would make this theme better?"
+---
+
+<!--
+  Before opening a new issue please search all issues at 
+  https://github.com/mmistakes/jekyll-theme-basically-basic/issues 
+  to avoid duplication.
+-->
+
+## Summary
+
+<!--
+  A short explanation of the enhancement or feature.
+-->
+
+## Motivation
+
+<!--
+  Why do you want to see this feature in the theme?
+  What use cases does it support?
+
+  NOTE: This theme has been designed as a base for you to customize and fit 
+  your site's unique needs. If a feature is not something most people will use, 
+  it likely won't be considered. When in doubt ask.
+-->
+
+## Drawbacks
+
+<!--
+  Why should this enhancement or feature **not** be considered?
+-->
diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md
new file mode 100644
index 0000000..843869d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -0,0 +1,22 @@
+---
+name: "Question"
+about: "Having trouble working with the theme?"
+---
+
+<!--
+  Before opening a new issue please:
+  
+  - Verify you have the latest versions of Jekyll and Basically Basic 
+    installed by running `bundle update`.
+  - Thoroughly read the theme's documentation at
+    https://github.com/mmistakes/jekyll-theme-basically-basic
+  - Search all issues at https://github.com/mmistakes/jekyll-theme-basically-basic/issues 
+    for solutions and to avoid duplication.
+  - Ask for help at https://talk.jekyllrb.com/
+  
+  After exhausting these suggestions ask your question below.
+
+  NOTE: Please provide a code repository, gist, code snippet, sample files, or 
+  screenshots to triage your issue.
+-->
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..1e13325
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,26 @@
+<!--
+  Thanks for creating a Pull Request! Before you submit, please make sure
+  you've done the following:
+
+  - Read the contributing document at https://github.com/mmistakes/jekyll-theme-basically-basic#contributing
+-->
+
+<!--
+  Choose one of the following by uncommenting it:
+-->
+
+<!-- This is a bug fix. -->
+<!-- This is an enhancement or feature. -->
+<!-- This is a documentation change. -->
+
+## Summary
+
+<!--
+  Provide a description of what your pull request changes.
+-->
+
+## Context
+
+<!--
+  Is this related to any GitHub issue(s)?
+-->
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e2546b..df3a764 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+### Changed
+- Update GitHub issue templates.
+
 ## [1.4.1] - 2018-08-07
 
 ### Added