diff --git a/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md b/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
index f926100..8062244 100644
--- a/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/01_BUG_REPORT.md
@@ -1,29 +1,33 @@
 ---
 name: Bug Report
 about: Create a report to help ZeroUI to improve
-title: 'bug: '
-labels: ''
-assignees: ''
+title: "bug: "
+labels: "bug"
+assignees: ""
 ---
 
-<!-- ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION. -->
-
 # Bug Report
 
 **ZeroUI version:**
+
 <!-- Please specify commit or tag version. -->
+
 latest
 
 **Current behavior:**
+
 <!-- Describe how the bug manifests. -->
 
 **Expected behavior:**
+
 <!-- Describe what the behavior would be without the bug. -->
 
 **Steps to reproduce:**
+
 <!--  Please explain the steps required to duplicate the issue, especially if you are able to provide a sample application. -->
 
 **Related code:**
+
 <!-- If you are able to illustrate the bug or feature request with an example, please provide it here -->
 
 ```
@@ -31,4 +35,5 @@ insert short code snippets here
 ```
 
 **Other information:**
-<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
+
+<!-- List any other information that is relevant to your issue. Related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
index 6e7c0e4..625ccef 100644
--- a/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
+++ b/.github/ISSUE_TEMPLATE/02_FEATURE_REQUEST.md
@@ -1,28 +1,31 @@
 ---
 name: Feature Request
 about: Suggest an idea for this project
-title: 'feat: '
-labels: ''
-assignees: ''
+title: "feat: "
+labels: "enhancement"
+assignees: ""
 ---
 
-<!-- ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION. -->
-
 # Feature Request
 
 **Describe the Feature Request**
+
 <!-- A clear and concise description of what the feature request is. Please include if your feature request is related to a problem. -->
 
 **Describe Preferred Solution**
+
 <!-- A clear and concise description of what you want to happen. -->
 
 **Describe Alternatives**
+
 <!-- A clear and concise description of any alternative solutions or features you've considered. -->
 
 **Related Code**
+
 <!-- If you are able to illustrate the bug or feature request with an example, please provide it here -->
 
 **Additional Context**
+
 <!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to add, use case, Stack Overflow links, forum links, screenshots, OS if applicable, etc. -->
 
 **If the feature request is approved, would you be willing to submit a PR?**
diff --git a/.github/ISSUE_TEMPLATE/03_SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/03_SUPPORT_QUESTION.md
index 60261c2..ca89bc0 100644
--- a/.github/ISSUE_TEMPLATE/03_SUPPORT_QUESTION.md
+++ b/.github/ISSUE_TEMPLATE/03_SUPPORT_QUESTION.md
@@ -1,9 +1,9 @@
 ---
 name: Support Question
 about: Question on how to use this project
-title: 'support: '
-labels: ''
-assignees: ''
+title: "support: "
+labels: "question"
+assignees: ""
 ---
 
 # Support Question
diff --git a/.github/ISSUE_TEMPLATE/04_REVIEW.md b/.github/ISSUE_TEMPLATE/04_REVIEW.md
new file mode 100644
index 0000000..c6fe596
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/04_REVIEW.md
@@ -0,0 +1,9 @@
+---
+name: Review
+about: Provide your feedback for existing code base
+title: "review: "
+labels: "enhancement"
+assignees: ""
+---
+
+# Review
diff --git a/.github/ISSUE_TEMPLATE/PULL_REQUEST_TEMPLATE.md b/.github/ISSUE_TEMPLATE/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..ca0f5c4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,40 @@
+<!--- Please provide a general summary of your changes in the title above -->
+
+## Pull request type
+
+<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed. -->
+
+Please check the type of change your PR introduces:
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, renaming)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Build related changes
+- [ ] Documentation content changes
+- [ ] Other (please describe):
+
+## What is the current behavior?
+
+<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
+
+Issue Number: N/A
+
+## What is the new behavior?
+
+<!-- Please describe the behavior or changes that are being added by this PR. -->
+
+-
+-
+-
+
+## Does this introduce a breaking change?
+
+- [ ] Yes
+- [ ] No
+
+<!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. -->
+
+## Other information
+
+<!-- Any other information that is important to this PR such as screenshots of how the component looks before and after the change. -->