diff --git a/.github/ISSUE_TEMPLATE/bugs.yml b/.github/ISSUE_TEMPLATE/bugs.yml
index 7979c12c..092d2d61 100644
--- a/.github/ISSUE_TEMPLATE/bugs.yml
+++ b/.github/ISSUE_TEMPLATE/bugs.yml
@@ -17,27 +17,27 @@ body:
     validations:
       required: false
 
-  - type: checkboxes
+  - type: dropdown
     id: modding
     attributes:
       label: "Are you modding a build from source or with Lua?"
       options:
-        - label: Lua
-        - label: Source
+        - Lua
+        - Source
     validations:
       required: true
 
-  - type: checkboxes
+  - type: dropdown
     id: btarget
     attributes:
       label: "What is your build target?"
       options:
-        - label: "Windows"
-        - label: "Linux"
-        - label: "Mac"
-        - label: "HTML5"
-        - label: "Flash/Air-based target"
-        - label: "Neko, HashLink, or other build system"
+        - "Windows"
+        - "Linux"
+        - "Mac"
+        - "HTML5"
+        - "Flash/Air-based target"
+        - "Neko, HashLink, or other build system"
     validations:
       required: true
 
diff --git a/.github/ISSUE_TEMPLATE/help.yml b/.github/ISSUE_TEMPLATE/help.yml
index eb2beccc..5399a54c 100644
--- a/.github/ISSUE_TEMPLATE/help.yml
+++ b/.github/ISSUE_TEMPLATE/help.yml
@@ -1,19 +1,42 @@
-name: Help wanted
+name: Help me!
 description: If you need help using the engine.
 labels: [help wanted]
 body:
-
-  - type: dropdown
+  - type: textarea
+    id: description
     attributes:
-      label: Are you trying to code on Source Code (Haxe) or on the Downloaded Build (Lua)?
-      options:
-        - Source Code
-        - Downloaded Build
+      label: "Describe your problem here."
     validations:
       required: true
-  - type: textarea
+
+  - type: dropdown
+    id: modding
     attributes:
-      label: Show an screenshot/video of your problem.
-      description: Put down here an screenshot of your compiling issue or whatever is happening to you.
+      label: "Are you modding a build from source or with Lua?"
+      options:
+        - Lua
+        - Source
     validations:
-      required: true
\ No newline at end of file
+      required: true
+
+  - type: dropdown
+    id: btarget
+    attributes:
+      label: "What is your build target?"
+      options:
+        - "Windows"
+        - "Linux"
+        - "Mac"
+        - "HTML5"
+        - "Flash/Air-based target"
+        - "Neko, HashLink, or other build system"
+    validations:
+      required: true
+
+  - type: input
+    id: buildsummary
+    attributes:
+      label: "Did you edit anything in this build? If so, mention or summarize your changes."
+      placeholder: "Yes, I edited ClientPrefs.hx and tried to add a new setting"
+    validations:
+      required: false