diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..28c703c0f
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# github: hlissner
+liberapay: hlissner
+custom: https://paypal.me/henriklissner
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..9fd980818
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,39 @@
+---
+name: "Bug report"
+about: "Something went wrong, please fix it!"
+title: "[BUG] "
+labels: "is:bug", "status:pending-review"
+---
+
+**Describe the bug**
+Begin with a short description of what the bug is.
+
+Some tips on writing a good bug report:
+- Explain what you expected to see and what actually happened
+- Include screenshots/casts of your issue, if possible
+- Add a link to your private config, if available
+- Expand on phrases like "it does not work" and clarify what commands are bound
+ on non-default keybinds.
+- Check your \*Messages\* buffer for warnings or errors (`SPC h e` or `M-x
+ view-echo-area-messages`).
+- Include a backtrace of the error, if possible. To acquire a backtrace, first
+ you must turn on `debug-on-error` then recreate the error. To do so, either:
+ - Turn on debug mode on the fly with `M-x toggle-debug-on-error`,
+ - Start Emacs with `emacs --debug-init`
+ - Or, if the error occurred while using `bin/doom`, use the `-d` or `--debug`
+ switches, or the `DEBUG` environment variable.
+- If the backtrace is especially long, put it in
+ ...
+Include the output of `M-x doom/info` or `~/.emacs.d/bin/doom info` here.
+
+Include the output of `M-x doom/info` or `~/.emacs.d/bin/doom info` here.
+
+Include the output of `M-x doom/info` or `~/.emacs.d/bin/doom info` here.
+
-
-If you received an error, paste the backtrace here.
-
-To acquire a backtrace either:
-
-1. Turn on debug mode with `M-x toggle-debug-on-error` or
-2. Start Emacs with `emacs --debug-init`
-3. Or, if the error occurred while using `bin/doom`, use the `-d` or `--debug`
- switch.
-
-Then recreate the error and Emacs should produce a backtrace.
-
-
-
-**Steps to reproduce**
-1. Select these example steps,
-2. Delete them,
-3. And replace them with precise steps to reproduce your issue.
-4. Fill in "system information" below.
-
-**Expected behavior**
-Describe what you expected to happen.
-
-**System information**
-Paste the output of `M-x doom/info` or `~/.emacs.d/bin/doom info` here.
diff --git a/docs/ISSUE_TEMPLATE/feature_request.md b/docs/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bb25c4ab1..000000000
--- a/docs/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: "Feature Request"
-about: "Make suggestions for improving Doom Emacs"
-title: "[FEATURE] "
-labels: "is:request", "status:pending-review"
----
-
-**Describe the feature**
-Start with a one-or-two sentence summary of your suggestion or request.
-
-Then follow with an expanded explanation. A few suggestions of what you could
-include here:
-
-+ Why you think it would be helpful,
-+ Screenshots/casts of this feature in another editor or elsewhere,
-+ Links to any relevant packages.
-
-**Relevant resources**
-Include links to relevant plugins, projects and/or websites.
-
-**System information**
-Include the output of `M-x doom/info` or `~/.emacs.d/bin/doom info` here. It's
-possible that the feature you're requesting is already in Doom, but you haven't
-enabled it.
diff --git a/docs/ISSUE_TEMPLATE/howto.md b/docs/ISSUE_TEMPLATE/howto.md
deleted file mode 100644
index 447e26c06..000000000
--- a/docs/ISSUE_TEMPLATE/howto.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: "How do I..."
-about: "How to get Doom to behave a certain way"
-title: "[HOWTO] "
-labels: "is:howto", "status:pending-review"
----
-
-**What I want to achieve**
-Start with a one-or-two sentence summary of what you are trying to do.
-
-Then follow with an expanded explanation. A few suggestions of what you could
-include:
-
-+ Code or steps you've tried that did not yield the results you wanted,
-+ Screenshots/casts of similar features in another editor or elsewhere,
-+ Additional material or links to resources that could help clarify what you are
- trying to do.
-+ A link to your private config, if it is available publicly.
-
-**System information**
-If it is pertinent to your goal, include the output of `M-x doom/info` or
-`~/.emacs.d/bin/doom info` here.
diff --git a/docs/PULL_REQUEST_TEMPLATE/bug_fix.md b/docs/PULL_REQUEST_TEMPLATE/bug_fix.md
deleted file mode 100644
index 018bcf4e8..000000000
--- a/docs/PULL_REQUEST_TEMPLATE/bug_fix.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: "Bug Fix"
-about: "For fixing bugs originating from Doom"
-title: "[BUGFIX] "
-labels: "is:bug", "status:pending-review"
----
-
-> This category is for bug fixes.
-
-Thank you for contributing to Doom!
-
-Before you submit this PR, please make sure it is targeted at `develop` and not
-`master`. Include links to relevant issues or, if the issue isn't self-evident,
-describe the problem that is being fixed.