diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..43ad379
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Report something that went wrong!
+title: "🐛[BUG] -"
+labels: bug
+assignees: ''
+
+---
+
+### Describe the bug.
+
+> _Clear and concise description of the bug.
+
+---
+
+### To Reproduce
+
+> _Steps to trigger the bug. Provide the minimal setup._
+
+1.  
+2.  
+3.  
+
+---
+
+### Environment
+
+> _Provide environment details or leave `N/A`._
+
+- GravLib Version:  
+- VEX Brain Firmware:  
+- Rust Version:  
+
+---
+
+### Related Code / Logs 
+
+> _Paste code snippets or error messages (use ``` for code blocks)._
+
+```rust
+// Example code
+```
+---
+
+### Additional Comments (optional)
+
+> _Are there other statements or comments you would like to make about this bug, feature or question?_
+
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index fc14a8e..2555f6c 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,33 +1,29 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[FEAT.]"
-labels: ''
+title: "[FEATURE]"
+labels: enhancement
 assignees: ''
 
 ---
 
+### Describe the Requested Feature
+
+> _Clear and concise description of the issue, request, or question._
+
 ---
-name: Feature Request
-about: Suggest an idea for the project
-title: "[FEATURE]"
-labels: "enhancement"
-assignees: ""
+
+### Current Implementation
+
+> _Is there any current implementations in the codebase that addresses this?
+
 ---
 
-#### Requested Feature
-<!-- Concisely describe the behavior you are requesting here -->
+### Motivation
 
-<!-- Describe any details in point form here -->
- - a
- - b
- - c
+> _Why do you think this is useful?
 
-#### Current Implementation
-<!-- Describe the current implementation here -->
+---
 
-#### Motivation
-<!-- Explain why this feature would benefit users and/or maintainers -->
+### Additional Comments (optional)
 
-#### (Optional) Possible Implementations and Alternatives
-<!-- Describe any possible implementations or alternatives you have considered -->