diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 02c0c251..d93d1422 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,20 +7,36 @@ assignees: ''
 
 ---
 
-## Bug report
+## Bug Report
+<!--
+Hello, and thank you for reporting an issue!
+Please fill out the points below, as it will make our process much easier.
+-->
 
-Hello! Thank you for reporting an issue!
-If you would fill out the below points, that would make our process a whole lot easier!
+<!-- Please tell us about your environment -->
+### Environment
+  - Jrnl version: <!-- Run `jrnl -v` -->
+  - Install method: <!-- How did you install jrnl? (pipx, brew, etc) -->
+  - OS <!-- What is your operating system? (MacOS, Linux, Windows) -->
 
-* **Please tell us about your environment:**
-  - Jrnl version: (run `jrnl -v`)
-  - How you installed Jrnl
-  - Operating system [MacOS, Linux, Windows?]
+### Current Behavior
+<!--
+Please put a short description of what is currently happening.
+-->
 
-* **What is the current behavior?**
+### Expected Behavior
+<!--
+Please write a short description of what you would expect to happen
+(instead of what is currently happening).
+-->
 
-* **Please provide the steps to reproduce and if possible a minimal demo of the problem**
+### Repro Steps
+<!--
+Please provide the steps to reproduce the problem. It is important for you to
+be as precise as possible here, since more info will let us help you faster.
+-->
 
-* **What is the expected behavior?**
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+### Other Information
+<!-- (e.g. more detailed explanation, stacktraces, related
+issues, suggestions how to fix, links for us to have context, eg.
+stackoverflow, gitter, etc) -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 8690ad71..d9061604 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -8,12 +8,24 @@ assignees: ''
 ---
 
 ## Feature Request
+<!--
+Hello, and thank you for reporting an issue!
+Please fill out the points below, as it will make our process much easier.
+-->
 
-Hello! Thank you for reporting an issue!
-If you would fill out the below points, that would make our process a whole lot easier!
+### Use Case/Motivation
+<!--
+What is the motivation / use case for changing the behavior?
+-->
 
-* **What is the motivation / use case for changing the behavior?**
+### Example Usage
+<!--
+Please provide examples of the usage you would like to see.
+e.g `jrnl --new-flag="super cool new feature"`
+-->
 
-* **Please provide examples of the usage**
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+### Other information
+<!--
+Please provide any other relevant info about this request (e.g. stacktraces,
+related issues, suggestions how to fix, etc)
+-->
diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md
index d9608885..04c2a217 100644
--- a/.github/ISSUE_TEMPLATE/support_request.md
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -7,20 +7,33 @@ assignees: ''
 
 ---
 
-## Support request
+## Support Request
+<!--
+Hello, and thank you for reporting an issue!
+Please fill out the points below, as it will make our process much easier.
+-->
 
-Hello! Thank you for reporting an issue!
-If you would fill out the below points, that would make our process a whole lot easier!
+### Environment
+<!--
+Please tell us about your environment
+-->
+  - Jrnl version: <!-- Run `jrnl -v` -->
+  - Install method: <!-- How did you install jrnl? (pipx, brew, etc) -->
+  - OS <!-- What is your operating system? (MacOS, Linux, Windows) -->
 
-* **Please tell us about your environment:**
+### What are you trying to do?
+<!--
+Please write a short description of what is happening.
+-->
 
-  - Jrnl version: (run `jrnl -v`)
-  - How you installed Jrnl
+### What have you tried?
+<!--
+Have you tried anything to fix the problem? This can help give us more
+information to help you with.
+-->
 
-  - Operating system [MacOS, Linux, Windows?]
-
-* **What are you trying to do?**
-
-* **What have you tried?**
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+### Other Information
+<!--
+Is there anything else we should know that might be helpful?
+e.g. detailed explanation, stacktraces, related issues, suggestions how to fix
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 49533409..cea2848c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,32 +1,26 @@
-
 <!--
-# **TEMPLATE PLEASE EDIT**
-*Thank you for wanting to contribute! Please fill out this description as well
-as look at the checklist!*
+Thank you for wanting to contribute!
 
-*Short block of text containing:
-- Relevant changes in text form
-- related issues
-- Motivation (if applicable)
-- Example of usage (if applicable)
-- Example of changes to config files (if applicable)
-*
+Please fill out this description, and the checklist below.
+
+Here are some key points to include in your description:
+- What is this new code intended to do?
+- Are there any related issues?
+- What is the motivation for this change?
+- What is an example of usage, or changes to config files? (if applicable)
 -->
 
 ### Checklist
 
-- [ ] The code change is tested and works locally.
-- [ ] Tests pass. Your PR cannot be merged unless tests pass. --
-  `poetry run behave`
-- [ ] The code passes linting via
-  [black](https://black.readthedocs.io/en/stable/) (consistent code styling). --
-  `poetry run black --check . --verbose --diff`
-- [ ] The code passes linting via [pyflakes](https://launchpad.net/pyflakes)
-  (logically errors and unused imports). -- `poetry run pyflakes jrnl features`
-- [ ] There is no commented out code in this PR.
-- [ ] Have you followed the guidelines in our Contributing document?
-- [ ] Have you checked to ensure there aren't other open
-  [Pull Requests](../pulls) for the same update/change?
-- [ ] Have you added an explanation of what your changes do and why you'd like
-  us to include them?
-- [ ] Have you written new tests for your core changes, as applicable?
+- [ ] I have read the [contributing doc](https://github.com/jrnl-org/jrnl/blob/develop/CONTRIBUTING.md).
+- [ ] I have included a link to the relevant issue number.
+- [ ] I have tested this code locally.
+- [ ] I have checked to ensure there aren't other open [pull requests](../pulls)
+  for the same issue.
+- [ ] I have you written new tests for these changes, as needed.
+- [ ] All tests pass.
+<!--
+NOTE: Your PR may not be reviewed if there are any failing tests. You can run
+tests locally with `make test` (see the contributing doc if you need help with
+`make`), or use our automated tests after you submit your PR.
+-->
diff --git a/issue_template.md b/issue_template.md
new file mode 100644
index 00000000..7f2c21d6
--- /dev/null
+++ b/issue_template.md
@@ -0,0 +1,8 @@
+# Stop
+
+Please don't file a blank issue.
+
+Fill out one of the templates from the link below and we'll be better able to
+help you.
+
+https://github.com/jrnl-org/jrnl/issues/new/choose