2 files changed, 38 insertions, 25 deletions
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ba1e400..dc0e021 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,30 +2,37 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[Bug report] "
-labels: ''
-assignees: ''
-
+labels: ["bug"]
+assignees: 
+  - base16-project/vim
 ---
 
-**Describe the bug**
+## Describe the bug
+
 <!-- A clear and concise description of what the bug is. -->
 
-**Expected behavior**
+## Expected behavior
+
 <!-- A clear and concise description of what you expected to happen. -->
 
-**Screenshots**
+## Screenshots
+
 <!-- If applicable, add screenshots to help explain your problem. -->
 
-**System**
-Vim or Neovim:
-Vim or Neovim version:
-Any other plugins you may consider relevant:
+## **System**
+
+**Vim or Neovim:**
 
-**Minimal configuration file**
-```vim
-" Add a minimal configuration file to dramatically increase
-" your chances of receiving help from a maintainer.
-```
+**Vim or Neovim version:**
+
+**Any other plugins you may consider relevant:**
+
+## Minimal configuration file
+
+<!-- Add a minimal configuration file to dramatically increase your
+chances of receiving help from a maintainer. -->
+
+## Additional context
 
-**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 d6fc74f..d9b663b 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,19 +2,25 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[Feature request] "
-labels: ''
-assignees: ''
-
+labels: ["feature"]
+assignees: 
+  - base16-project/vim
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe.
+
 <!-- A clear and concise description of what the problem is. -->
 
-**Describe the solution you'd like**
+## 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. -->
+## Describe alternatives you've considered
+
+<!-- A clear and concise description of any alternative solutions or
+features you've considered. -->
+
+## Additional context
 
-**Additional context**
-<!-- Add any other context or screenshots about the feature request here. -->
+<!-- Add any other context or screenshots about the feature request
+here. -->