diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index 77af84c94..fb54e9063 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -38,10 +38,10 @@ body:
   - type: textarea
     id: what-happened
     attributes:
-      label: What would you like?
-      description: In as much detail as possible, what would you like to have or see in the program?
-      placeholder: Tell us what you want!
-      value: "I want this!"
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 9e2101f21..517f48470 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -55,10 +55,10 @@ body:
   - type: checkboxes
     id: self-fix
     attributes:
-      label: Do you want to try to fix this bug?
-      description: The IDE is written in Javascript, and includes React components. Do you want to try to fix the bug yourself (optional question)? If so, you can fork the repo, try to make the fix, and submit a PR.
+      label: Do you want to try to add this feature?
+      description: The IDE is written in TypeScript, and includes React components. Do you want to try to implement this feature yourself? If so, you can fork the repo, try to make the fix, and submit a PR.
       options:
-        - label: I want to try to fix this bug
+        - label: I want to try to add this feature!
           required: false
   - type: checkboxes
     id: terms