diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 12384fc..2780970 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,32 +1,29 @@
 ---
 name: Bug report
-about: Something doesn't work how you expect it to
+about: Something didn't work like you expected
 title: "[BUG]"
-labels: ""
+labels: "\U0001F41B Bug"
 assignees: PineaFan
+
 ---
 
 [Describe the bug in one line, keep it concise]
 
-**To Reproduce**
-Steps to reproduce the behaviour:
+**Command or Feature:**
+The name of the command (e.g. /settings filters) or the feature (e.g. Message edit logs)
 
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See an error
+**Steps to reproduce:**
+1. Run ...
+2. Press ...
 
-**Expected behaviour**
-A clear and concise description of what you expected to happen.
+**Expected behaviour:**
+Explain what you expected to happen in one line
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Actual behaviour:**
+What was meant to happen?
 
-**Desktop (please complete the following information):**
-
--   OS: [e.g. iOS]
--   Browser [e.g. chrome, safari]
--   Version [e.g. 22]
+**Version:**
+Let us know the date this happened, so we can check if it's already been fixed
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index b865782..0357118 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,18 +2,22 @@
 name: Feature request
 about: I want something added to Nucleus
 title: "[FEATURE]"
-labels: ""
+labels: "✓ Feature"
 assignees: PineaFan
+
 ---
 
-**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 [...]
+**Is this related to a bug? If so, briefly explain the bug below**
+N/A
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+**What's your idea?**
+A clear and concise description of what you'd like us to add
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+**How would you like it implemented?**
+List any options you'd like your feature to add here
+
+**How does this help?**
+If it helps with the feature, explain your use case and how this feature helps to solve the problem
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context about the feature request