diff --git a/.github/ISSUE_TEMPLATE/01_bug_report.yml b/.github/ISSUE_TEMPLATE/01_bug_report.yml
new file mode 100644
index 0000000..07691f9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01_bug_report.yml
@@ -0,0 +1,107 @@
+name: Bug Report
+description: "Found a bug? We'd appreciate if you'd first search through our open issues and docs, to make sure the issue isn't already known."
+labels: ["bug"]
+title: "bug: " 
+body:
+  - type: checkboxes
+    attributes:
+      label: "Dupe Check"
+      options:
+        - label: "I have [searched Cursor bugs](https://github.com/getcursor/cursor/issues?q=is%3Aissue+label%3Abug+) and there are no duplicates"
+          required: true
+  - type: textarea
+    id: "describe-the-bug"
+    attributes:
+      label: "Describe the bug"
+      description: "A clear and concise description of what the bug is."
+      placeholder: Tell us what you see.
+    validations:
+      required: true
+  - type: textarea
+    id: "to-reproduce"
+    attributes:
+      label: "To reproduce"
+      description: "Bug reports with clear reproduction will get prioritized higher and addressed more quickly."
+      placeholder: "Steps to reproduce: 1. Go to '...' 2. Click on '...' 3. Scroll down to '...' 4. See error '...'"
+    validations:
+      required: true
+  - type: textarea
+    id: "expected-behavior"
+    attributes:
+      label: "Expected behavior"
+      description: "A clear and concise description of what you expected to happen."
+      placeholder: Tell us what you expect to see.
+    validations:
+      required: false
+  - type: textarea
+    id: "screenshots"
+    attributes:
+      label: "Screenshots"
+      description: "If applicable, add screenshots/videos to help explain your problem. While optional, screenshots help expedite the time in which your bug is addressed."
+    validations:
+      required: false
+  - type: dropdown
+    id: "os"
+    attributes:
+      label: "Operating system"
+      multiple: false
+      options:
+        - MacOS
+        # - Linux
+        # - Windows
+    validations:
+      required: true
+  - type: textarea
+    id: "cursor-version"
+    attributes:
+      label: "Current Cursor version"
+      description: "Click on Cursor Menu->About Cursor->Copy"
+      placeholder: |
+        Version: 0.36.2
+        VSCode Version: 1.89.1
+        Commit: 9a6d781540ba2732cf26551c07629e68121c6580
+        Date: 2024-07-07T21:57:45.723Z
+        Electron: 28.2.8
+        ElectronBuildId: undefined
+        Chromium: 120.0.6099.291
+        Node.js: 18.18.2
+        V8: 12.0.267.19-electron.0
+        OS: Darwin arm64 23.5.0
+    validations:
+      required: true
+  - type: dropdown
+    id: "regression"
+    attributes:
+      label: "Regression"
+      description: "Is this a regression (used to work in a previous Cursor version)?"
+      multiple: false
+      options:
+        - "No, this bug or issue has existed throughout my experience using Cursor"
+        - "Yes, this bug started recently"
+    validations:
+      required: true
+  - type: input
+    id: "cursor-version-regression-date"
+    attributes:
+      label: "Recent working Cursor date"
+      description: "Most recent date that Cursor worked as expected"
+    validations:
+      required: false
+  - type: textarea
+    id: "additional-context"
+    attributes:
+      label: "Additional context"
+      description: "Add any other context about the problem here"
+    validations:
+      required: false
+  - type: dropdown
+    id: "blocker"
+    attributes:
+      label: "Does this block you from using Cursor IDE daily?"
+      description: "All feedback will be reviewed, even if you select 'No'."
+      multiple: false
+      options:
+        - "No"
+        - "Yes, this issue prevents me from using Cursor IDE daily."
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/02_feature_request.yml b/.github/ISSUE_TEMPLATE/02_feature_request.yml
new file mode 100644
index 0000000..da10579
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_feature_request.yml
@@ -0,0 +1,46 @@
+name: Feature Request
+description: "Have a great new idea? We'd love to know, please search through our existing feature requests, and upvote it if it's already been filed."
+labels: ["enhancement"]
+title: "rfc: "
+body:
+  - type: checkboxes
+    attributes:
+      label: "Dupe Check"
+      options:
+        - label: "I have [searched Cursor feature requests](https://github.com/getcursor/cursor/issues?q=label%3Aenhancement+) and there are no duplicates"
+          required: true
+  - type: textarea
+    id: "describe-solution"
+    attributes:
+      label: "Describe the solution you'd like?"
+      description: "A clear and concise description of what you want to happen."
+    validations:
+      required: true
+  - type: textarea
+    id: "related-to-problem"
+    attributes:
+      label: "Is your feature request related to a problem? Please describe."
+      description: "A clear and concise description of what the problem is."
+      placeholder: "I'm always frustrated when [...]"
+    validations:
+      required: false
+  - type: textarea
+    id: "additional-context"
+    attributes:
+      label: "Additional context"
+      description: "Add any other context or screenshots about the feature request here. If you want to upload a picture you can drag one in from Finder."
+    validations:
+      required: false
+  - type: dropdown
+    id: "importance"
+    attributes:
+      label: "How important is this feature to you?"
+      multiple: false
+      options:
+        - "1 (Not too important)"
+        - "2"
+        - "3"
+        - "4"
+        - "5 (Can't work without it!)"
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 9d90685..0000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-name: Bug Report
-about: Screenshot!
-title: ''
-labels: ''
-assignees: ''
-
----
-
-1) If you can, please include a screenshot of your problem
-2) Please include the name of your operating system
-3) If you can, steps to reproduce are super helpful
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..d8d67bf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Cursor Homepage
+    url: https://www.cursor.com
+  - name: Cursor Changelog
+    url: https://changelog.cursor.sh/
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index df81be2..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.