diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7ae5062..dd84ea7 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,45 +1,38 @@
-<!--
-Thank you for your contribution and taking the time to report the issue!
-Note: Please search to see if an issue already exists for the bug you encountered.
--->
-
 ---
-name: 🐞 Bug
-about: File a bug/issue
-title: '[BUG] <title>'
-labels: Bug, Needs Triage
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
 assignees: ''
 
 ---
 
+**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.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
 
-### Current Behavior:
-<!-- A concise description of what you're experiencing. -->
-
-### Expected Behavior:
-<!-- A concise description of what you expected to happen. -->
-
-### Steps To Reproduce:
-<!--
-Example: steps to reproduce the behavior:
-1. In this environment...
-1. With this config...
-1. Run '...'
-1. See error...
-
-or a minimal example
--->
-
-### Environment:
-<!--
-Example:
-- OS: Ubuntu 20.04
-- Python: 3.14.0
-- xmlrunner: 4.0.0
-output of `pip list`
--->
-
-### Anything else:
-<!--
-Links? References? Anything that will give us more context about the issue that you are encountering!
--->
+**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 565a416..bbcbbe7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,55 +1,20 @@
-<!--
-Thank you for your contribution and taking the time to report the issue!
-Note: Please search to see if an issue already exists for the bug you encountered.
--->
-
 ---
-name: 🚀 Feature Request
-about: File a feature request
-title: '[Feature] <title>'
-labels: Feature, Needs Triage
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
 assignees: ''
 
 ---
 
+**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 [...]
 
-### Current Behavior:
-<!--
-Explain why the current behavior has shortcomings.
--->
-
-### Feature Behavior:
-<!--
-A detailed description of the feature.
-Explain the pros/cons of this approach.
-Explain the target audience for this feature,
-e.g. is it for a very niche use case? or will everybody use it?
--->
-
-### Test Plan for the feature
-<!--
-How to test the new feature and ensure it plays nice with other existing features.
-How to verify that it works?
-Ideas for unit tests?
--->
-
-### Alternative solutions:
-<!--
-Explain how you are currently achieving the results a different way.
-Explain the pros/cons of the alternative solutions.
--->
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
 
-### Environment:
-<!--
-Example:
-- OS: Ubuntu 20.04
-- Python: 3.14.0
-- xmlrunner: 4.0.0
-output of `pip list`
--->
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
 
-### Anything else:
-<!--
-Links? References?
-Anything that will give us more context about the feature request!
--->
+**Additional context**
+Add any other context or screenshots about the feature request here.