diff --git a/.github/ISSUE_TEMPLATE/bugreport.yml b/.github/ISSUE_TEMPLATE/bugreport.yml
index 0f49008..33339ee 100644
--- a/.github/ISSUE_TEMPLATE/bugreport.yml
+++ b/.github/ISSUE_TEMPLATE/bugreport.yml
@@ -1,42 +1,39 @@
 name: Bug Report
 description: Create a report to help us improve
 title: '[BUG] <title>'
-labels: bug
+labels: ["Category::Bug", "Type::Report"]
 body:
 - type: checkboxes
   attributes:
-    label: 'Checkboxes'
+    label: 'Pre-checks'
     description: 'Check the boxes that apply'
     options:
       - label: 'I have searched the [issues](https://github.com/kqnade/CHaserLua/issues) of this repository and believe that this is not a duplicate.'
         required: true
       - label: 'I have searched the [documentation](https://github.com/kqnade/CHaserLua/readme.md) and believe that my question is not covered.'
         required: true
+      - label: 'I have searched the [Wiki](https;//github.com/kqnade/CHaserLua/wiki) and believe that my question is not covered.'
+        required: true
 - type: textarea
   attributes:
     label: 'Describe the bug'
     description: 'A clear and concise description of what the bug is.'
     placeholder: 'I was trying to [...] but [...]'
-    render: shell
 - type: textarea
   attributes:
     label: 'To Reproduce'
     description: 'Steps to reproduce the behavior:'
     placeholder: '1. Go to [...]\n2. Click on [...]\n3. Scroll down to [...]\n4. See error'
-    render: shell
 - type: textarea
   attributes:
     label: 'Expected behavior'
     description: 'A clear and concise description of what you expected to happen.'
     placeholder: 'I expected [...] to happen because [...].'
-    render: shell
 - type: textarea
   attributes:
     label: 'Screenshots'
     description: 'If applicable, add screenshots to help explain your problem.'
-    render: shell
 - type: textarea
   attributes:
     label: 'Additional context'
-    description: 'Add any other context about the problem here.'
-    render: shell
\ No newline at end of file
+    description: 'Add any other context about the problem here.'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/featurerequest.yml b/.github/ISSUE_TEMPLATE/featurerequest.yml
index c2eb03d..00816e3 100644
--- a/.github/ISSUE_TEMPLATE/featurerequest.yml
+++ b/.github/ISSUE_TEMPLATE/featurerequest.yml
@@ -1,37 +1,35 @@
 name: Feature Request
 description: Suggest an idea for this project
 title: '[FEATURE] <title>'
-labels: enhancement
+labels: ["Category::Enhancement", "Type::Request"]
 body:
 - type: checkboxes
   attributes:
-    label: 'Checkboxes'
+    label: 'Pre-checks'
     description: 'Check the boxes that apply'
     options:
       - label: 'I have searched the [issues](https://github.com/kqnade/CHaserLua/issues) of this repository and believe that this is not a duplicate.'
         required: true
       - label: 'I have searched the [documentation](https://github.com/kqnade/CHaserLua/readme.md) and believe that my request is not covered.'
         required: true
+      - label: 'I have searched the [Wiki](https;//github.com/kqnade/CHaserLua/wiki) and believe that my request is not covered.'
+        required: true
 - type: textarea
   attributes:
     label: 'Describe the request'
     description: 'A clear and concise description of what the request is.'
     placeholder: 'I was trying to [...] but [...]'
-    render: shell
 - type: textarea
   attributes:
     label: 'Describe the solution you would like'
     description: 'A clear and concise description of what you want to happen.'
     placeholder: 'I would like [...] to happen because [...].'
-    render: shell
 - type: textarea
   attributes:
     label: 'Describe alternatives you have considered'
     description: 'A clear and concise description of any alternative solutions or features you have considered.'
     placeholder: 'I have also considered [...] but [...].'
-    render: shell
 - type: textarea
   attributes:
     label: 'Additional context'
-    description: 'Add any other context or screenshots about the feature request here.'
-    render: shell
\ No newline at end of file
+    description: 'Add any other context or screenshots about the feature request here.'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/helpwanted.yml b/.github/ISSUE_TEMPLATE/helpwanted.yml
new file mode 100644
index 0000000..4fdee75
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/helpwanted.yml
@@ -0,0 +1,35 @@
+name: Help Wanted
+description: Ask for help with a specific problem
+title : '[HELP] <title>'
+labels: ["Category::Help wanted", "Type::Request"]
+body:
+- type: checkboxes
+  attributes:
+    label: 'Pre-checks'
+    description: 'Check the boxes that apply'
+    options:
+      - label: 'I have searched the [issues](https://github.com/kqnade/CHaserLua/issues) of this repository and believe that this is not a duplicate.'
+        required: true
+      - label: 'I have searched the [documentation](https://github.com/kqnade/CHaserLua/readme.md) and believe that my request is not covered.'
+        required: true
+      - label: 'I have searched the [Wiki](https;//github.com/kqnade/CHaserLua/wiki) and believe that my request is not covered.'
+        required: true
+- type: textarea
+  attributes:
+    label: 'Describe the problem'
+    description: 'A clear and concise description of what the problem is.'
+    placeholder: 'I was trying to [...] but [...]'
+- type: textarea
+  attributes:
+    label: 'Describe the solution you would like'
+    description: 'A clear and concise description of what you want to happen.'
+    placeholder: 'I would like [...] to happen because [...].'
+- type: textarea
+  attributes:
+    label: 'Describe alternatives you have considered'
+    description: 'A clear and concise description of any alternative solutions or features you have considered.'
+    placeholder: 'I have also considered [...] but [...].'
+- type: textarea
+  attributes:
+    label: 'Additional context'
+    description: 'Add any other context or screenshots about the feature request here.'
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/questions.yml b/.github/ISSUE_TEMPLATE/questions.yml
new file mode 100644
index 0000000..f9af3de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/questions.yml
@@ -0,0 +1,25 @@
+name: Question
+description: Ask a question
+title: '[QUESTION] <title>'
+labels: ["Category::Question", "Type::Request"]
+body:
+- type: checkboxes
+  attributes:
+    label: 'Pre-checks'
+    description: 'Check the boxes that apply'
+    options:
+      - label: 'I have searched the [issues](https://github.com/kqnade/CHaserLua/issues) of this repository and believe that this is not a duplicate.'
+        required: true
+      - label: 'I have searched the [documentation](https://github.com/kqnade/CHaserLua/readme.md) and believe that my question is not covered.'
+        required: true
+      - label: 'I have searched the [Wiki](https;//github.com/kqnade/CHaserLua/wiki) and believe that my question is not covered.'
+        required: true
+- type: textarea
+  attributes:
+    label: 'Describe the question'
+    description: 'A clear and concise description of what the question is.'
+    placeholder: 'Why [...]?'
+- type: textarea
+  attributes:
+    label: 'Additional context'
+    description: 'Add any other context or screenshots about the question here.'
\ No newline at end of file