diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..ec4343ce
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,58 @@
+---
+name: \U0001F41E Bug report
+about: Did you find a bug?
+title: ''
+labels: 'type: bug'
+assignees: ''
+
+---
+
+<!--
+  Hi there! Thank you for discovering and submitting an issue.
+
+  Before you submit this; let's make sure of a few things.
+  Please make sure the following boxes are ticked if they are correct.
+  If not, please try and fulfill these first.
+-->
+
+<!-- Checked checkbox should look like this: [x] -->
+ - [ ] I am on the [latest](https://github.com/ActivityWatch/activitywatch/releases/latest) ActivityWatch version.
+ - [ ] I have searched the issues of this repo and believe that this is not a duplicate.
+
+
+<!--
+  Once those are done, if you're able to fill in the following list with your information,
+  it'd be very helpful to whoever handles the issue.
+-->
+
+- **OS version and name**: <!-- Replace with version + name -->
+- **ActivityWatch version**: <!-- Replace with version -->
+
+## Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+## To Reproduce
+<!--
+  Steps to reproduce the behavior:
+    1. Go to '...'
+    2. Click on '....'
+    3. Scroll down to '....'
+    4. See error
+-->
+
+## Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+## Documentation
+<!--
+  If applicable, add screenshots or logs to help explain your problem.
+
+  Logs can be found in different places depending on platform:
+   - Windows: `C:\Users\<USER>\AppData\Local\ActivityWatch\Logs`
+   - macOS: `/Users/<USER>/Library/Logs/activitywatch`
+   - Linux: `/home/<USER>/.cache/activitywatch/log`
+  They can be opened with any plain text editor.
+-->
+
+## Additional context
+<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index af6edcad..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**For us to be able to understand the issue you're having you need to follow this template.** Please make sure there isn't already an issue for the bug you've found, otherwise it'll just take more resources, which means less time for us to actually fix bugs. Thanks for reporting!
-
-## Describe the bug
-A clear and concise description of what the bug is.
-
-## To Reproduce
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected behavior
-A clear and concise description of what you expected to happen.
-
-## Documentation
-If applicable, add screenshots or logfiles to help explain your problem.
-
-Logfiles can be found in different places depending on platform:
- - Windows: `C:\Users\<USER>\AppData\Local\ActivityWatch\Logs`
- - macOS: /Users/<USER>/Library/Logs/activitywatch
- - Linux: /home/<USER>/.cache/SuperApp/log
-
-## Environment
- - ActivityWatch version: [e.g. v0.8.0b7]
- - OS: [e.g. Windows 10, Linux (Ubuntu), macOS (High Sierra)]
-
-## Additional context
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..7e185283
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+# Issue templates are based on templates for poetry:
+# https://github.com/python-poetry/poetry/tree/master/.github/ISSUE_TEMPLATE
+blank_issues_enabled: false
+contact_links:
+  - name: "\U0001F381 Feature requests"
+    url: https://forum.activitywatch.net/c/features
+    about: Request and vote on features on the forum.
diff --git a/.github/ISSUE_TEMPLATE/everything-else.md b/.github/ISSUE_TEMPLATE/everything-else.md
new file mode 100644
index 00000000..d3921d86
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/everything-else.md
@@ -0,0 +1,18 @@
+---
+name: "\U0001F5C3 Everything Else"
+about: For questions and issues that do not fall in any of the other categories.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Describe your question and issue here. This space is meant to be used for general questions that are neither bugs nor feature requests. If you're looking for help or support, please post on the forum instead: https://forum.activitywatch.net/ -->
+
+
+<!-- Checked checkbox should look like this: [x] -->
+- [ ] I have searched the [issues](https://github.com/ActivityWatch/activitywatch/issues) of this repo and believe that this is not a duplicate.
+- [ ] I have searched the [documentation](https://docs.activitywatch.net/en/latest/) and believe that my question is not covered.
+
+## Issue
+<!-- Now feel free to write your issue, but please be descriptive! Thanks again 🙌 ❤️ -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 8edc3f35..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-## Feature requests belong on the forum [here](https://forum.activitywatch.net/c/features)!
-
-Below is a template suggestion you should preferably use.
-
-------------
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.