diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 0350edfa..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Logs**
-Please provide a log of your issue with verbose logging enabled (See General tab of the plugin).  
-In case of a crash, please also include the corresponding crash log.  
-See [here](https://obsproject.com/forum/threads/please-post-a-log-with-your-issue-heres-how.23074/) for a description where to find the log files and how to share them.  
-Please share the currently used plugin settings by exporting them them to a file (See General tab of the plugin).  
-If applicable, add screenshots to help explain your problem.
-
-**Version information**
- - OS: [e.g. Windows 10]
- - OBS Version [e.g. 27.1.3]
- - Plugin Version [e.g. 1.17.1]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 00000000..09c9feaf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,111 @@
+# Based on the OBS issue templates
+# https://github.com/obsproject/.github/tree/master/.github/ISSUE_TEMPLATE
+
+name: Bug Report
+description: Report a bug or crash
+body:
+- type: markdown
+  id: md_welcome
+  attributes:
+    value: This form is for reporting bugs for Advanced Scene Switcher!
+- type: dropdown
+  id: os_info
+  attributes:
+    label: Operating System Info
+    description: What Operating System are you running?
+    options:
+    - Windows 11
+    - Windows 10
+    - macOS 14
+    - macOS 13
+    - macOS 12
+    - macOS 11
+    - Ubuntu 23.10
+    - Ubuntu 22.04
+    - Other
+  validations:
+    required: true
+- type: input
+  id: os_info_other
+  attributes:
+    label: Other OS
+    description: "If \"Other\" was selected above, what OS are you using?"
+    placeholder: "e.g., Arch Linux, FreeBSD"
+  validations:
+    required: false
+- type: input
+  id: obs_version
+  attributes:
+    label: OBS Studio Version
+    description: What version of OBS Studio are you using?
+    placeholder: 30.2.2
+  validations:
+    required: true
+- type: input
+  id: advss_version
+  attributes:
+    label: Advanced Scene Switcher Version
+    description: What version of the Advanced Scene Switcher are you using?
+    placeholder: 1.27.2
+  validations:
+    required: true
+- type: input
+  id: settings
+  attributes:
+    label: Plugin settings
+    description: |
+      Please provide the plugin settings used.
+      Either only [export the macros](https://github.com/WarmUpTill/SceneSwitcher/wiki/Exporting-and-importing-individual-macros) relevant to this issue or [export all settings](https://github.com/WarmUpTill/SceneSwitcher/wiki/Saving-and-loading-settings#how-to-create-and-import-a-backup-of-your-settings) on the General tab of the plugin.
+  validations:
+    required: false
+- type: input
+  id: obs_log_url
+  attributes:
+    label: OBS Studio Log URL
+    description: Please provide the obsproject.com URL (from Help menu > Log Files > Upload Current/Previous Log File) to the OBS log file where this issue occurred.
+  validations:
+    required: false
+- type: input
+  id: obs_crash_log_url
+  attributes:
+    label: OBS Studio Crash Log URL
+    description: If this is a crash report, please provide the obsproject.com URL to the OBS crash log file where this issue occurred.
+  validations:
+    required: false
+- type: textarea
+  id: expected_behavior
+  attributes:
+    label: Expected Behavior
+    description: "What did you expect to happen?"
+  validations:
+    required: true
+- type: textarea
+  id: current_behavior
+  attributes:
+    label: Current Behavior
+    description: "What actually happened?"
+  validations:
+    required: true
+- type: textarea
+  id: steps_to_reproduce
+  attributes:
+    label: Steps to Reproduce
+    description: "How do you trigger this bug? Please walk us through it step by step."
+    placeholder: |
+      1.
+      2.
+      3.
+      ...
+    value: |
+      1.
+      2.
+      3.
+      ...
+  validations:
+    required: true
+- type: textarea
+  id: additional_notes
+  attributes:
+    label: Anything else we should know?
+  validations:
+    required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 00000000..1f3442de
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: 📚 Wiki
+    url: https://github.com/WarmUpTill/SceneSwitcher/wiki
+    about: For explanations on how the plugin works or to see example guides, check out the wiki.
+  - name: 💬 OBS Forum Thread
+    url: https://obsproject.com/forum/threads/advanced-scene-switcher.48264
+    about: To discuss the plugin or get assistance, feel free to use the OBS forum thread or the GitHub discussions page.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index eec290ac..00000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Help/Support
-    url: https://github.com/WarmUpTill/SceneSwitcher/wiki
-    about: For general questions about how to use and configure the plugin please have a look at the wiki (https://github.com/WarmUpTill/SceneSwitcher/wiki) or ask questions in the OBS forum (https://obsproject.com/forum/threads/advanced-scene-switcher.48264/)
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7d..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +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.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 00000000..887eb9d9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,37 @@
+# Based on the OBS issue templates
+# https://github.com/obsproject/.github/tree/master/.github/ISSUE_TEMPLATE
+
+name: Feature request
+description: Suggest an idea for this projectReport a bug or crash
+body:
+- type: markdown
+  id: md_welcome
+  attributes:
+    value: This form is for requesting new features for Advanced Scene Switcher!
+- type: textarea
+  id: background
+  attributes:
+    label: Background
+    description: "Is your feature request related to a problem? Please describe."
+  validations:
+    required: false
+- type: textarea
+  id: solution
+  attributes:
+    label: Solution
+    description: "Describe the solution you'd like."
+  validations:
+    required: true
+- type: textarea
+  id: alternatives
+  attributes:
+    label: Alternatives
+    description: "Describe alternatives you've considered."
+  validations:
+    required: false
+- type: textarea
+  id: additional_notes
+  attributes:
+    label: Anything else we should know?
+  validations:
+    required: false
\ No newline at end of file