Add MIDI device name check

2026-08-29 04:36:21 -05:00 · 2024-05-10 01:15:16 +02:00
436 changed files with 14824 additions and 43480 deletions
--- a/.cmake-format.json
+++ b/.cmake-format.json
@@ -6,6 +6,15 @@
    "autosort": true
  },
  "additional_commands": {
+    "find_qt": {
+      "flags": [],
+      "kwargs": {
+        "COMPONENTS": "+",
+        "COMPONENTS_WIN": "+",
+        "COMPONENTS_MACOS": "+",
+        "COMPONENTS_LINUX": "+"
+      }
+    },
    "set_target_properties_obs": {
      "pargs": 1,
      "flags": [],
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,36 @@
+---
+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.
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,112 +0,0 @@
-# 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 24.04
-    - 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
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 📚 Wiki
+  - name: Help/Support
    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.
+    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/)
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+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.
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,37 +0,0 @@
-# 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 project
-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
--- a/.github/scripts/.Aptfile
+++ b/.github/scripts/.Aptfile
@@ -9,10 +9,4 @@ package 'libxtst-dev'
 package 'libxss-dev'
 package 'libopencv-dev'
 package 'libtesseract-dev'
-package 'libproc2-dev'
-package 'libusb-1.0-0-dev'
-package 'libpaho-mqttpp-dev'
-package 'libpaho-mqtt-dev'
-package 'libpaho-mqtt-dev'
-package 'libasound2-dev'
-package 'libpipewire-0.3-dev'
+package 'libprocps-dev'
--- a/.github/scripts/.Brewfile
+++ b/.github/scripts/.Brewfile
@@ -3,5 +3,3 @@ brew "coreutils"
 brew "cmake"
 brew "jq"
 brew "xcbeautify"
-brew "automake"
-brew "libtool"
--- a/.github/scripts/.Wingetfile
+++ b/.github/scripts/.Wingetfile
@@ -1,4 +1,3 @@
 package 'cmake', path: 'Cmake\bin', bin: 'cmake'
 package 'innosetup', path: 'Inno Setup 6', bin: 'iscc'
-package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
-package 'Microsoft.VisualStudio.Locator', path: 'vswhere', bin: 'vswhere'
+package 'OpenSSL', path: 'OpenSSL', bin: 'openssl'
--- a/.github/scripts/.build-deps.zsh
+++ b/.github/scripts/.build-deps.zsh
@@ -306,7 +306,7 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
        log_info "Building OpenCV ..."
        cmake --build ${opencv_build_dir} --config Release

-        log_info "Installing OpenCV ..."
+        log_info "Installing OpenCV..."
        cmake --install ${opencv_build_dir} --prefix "${advss_dep_path}" --config Release || true
        popd

@@ -335,69 +335,52 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
        log_info "Building Leptonica ..."
        cmake --build ${leptonica_build_dir} --config Release

-        log_info "Installing Leptonica ..."
+        log_info "Installing Leptonica..."
        # Workaround for "unknown file attribute: H" errors when running install
        cmake --install ${leptonica_build_dir} --prefix "${advss_dep_path}" --config Release || :
        popd

        local tesseract_dir="${project_root}/deps/tesseract"
-        local tesseract_build_dir_x86_64="${tesseract_dir}/build_x86_64"
+        local tesseract_build_dir="${tesseract_dir}/build_${target##*-}"
+
+        local -a tesseract_cmake_args=(
+          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
+          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
+          -DSW_BUILD=OFF
+          -DBUILD_TRAINING_TOOLS=OFF
+          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
+          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
+        )
+
+        if [ "${target}" != "macos-x86_64" ]; then
+          tesseract_cmake_args+=(
+            -DCMAKE_SYSTEM_PROCESSOR=aarch64
+            -DHAVE_AVX=FALSE
+            -DHAVE_AVX2=FALSE
+            -DHAVE_AVX512F=FALSE
+            -DHAVE_FMA=FALSE
+            -DHAVE_SSE4_1=FALSE
+            -DHAVE_NEON=TRUE
+          )
+          sed -i'.original' 's/HAVE_NEON FALSE/HAVE_NEON TRUE/g' "${tesseract_dir}/CMakeLists.txt"
+        fi

        pushd ${tesseract_dir}
-        log_info "Configure Tesseract (x86_64) ..."
+        log_info "Configure Tesseract ..."
+        cmake -S . -B ${tesseract_build_dir} ${tesseract_cmake_args}

-        local -a tesseract_cmake_args=(
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_SYSTEM_NAME="Darwin"
-          -DCMAKE_OSX_ARCHITECTURES=x86_64
-          -DCMAKE_SYSTEM_PROCESSOR=x86_64
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
-          -DSW_BUILD=OFF
-          -DBUILD_TRAINING_TOOLS=OFF
-          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
-          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
-        )
-
-        cmake -S . -B ${tesseract_build_dir_x86_64} ${tesseract_cmake_args}
-
-        log_info "Building Tesseract (x86_64) ..."
-        cmake --build ${tesseract_build_dir_x86_64} --config Release
-
-        log_info "Configure Tesseract (arm64) ..."
-
-        git checkout .
-
-        local tesseract_build_dir_arm64="${tesseract_dir}/build_arm64"
-        local -a tesseract_cmake_args=(
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_SYSTEM_NAME="Darwin"
-          -DCMAKE_OSX_ARCHITECTURES=arm64
-          -DCMAKE_SYSTEM_PROCESSOR=arm64
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
-          -DSW_BUILD=OFF
-          -DBUILD_TRAINING_TOOLS=OFF
-          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
-          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
-        )
-
-        cmake -S . -B ${tesseract_build_dir_arm64} ${tesseract_cmake_args}
-
-        log_info "Building Tesseract (arm64) ..."
-        cmake --build ${tesseract_build_dir_arm64} --config Release
-
-        log_info "Combine arm and x86 libtesseract binaries ..."
-        mv ${tesseract_build_dir_arm64}/libtesseract.a ${tesseract_build_dir_arm64}/libtesseract_arm.a
-        lipo -create ${tesseract_build_dir_x86_64}/libtesseract.a ${tesseract_build_dir_arm64}/libtesseract_arm.a -output ${tesseract_build_dir_arm64}/libtesseract.a
+        log_info "Building Tesseract ..."
+        cmake --build ${tesseract_build_dir} --config Release

        log_info "Installing Tesseract..."
-        cmake --install ${tesseract_build_dir_arm64} --prefix "${advss_dep_path}" --config Release
-
+        cmake --install ${tesseract_build_dir} --prefix "${advss_dep_path}" --config Release
        popd

        pushd ${advss_dep_path}
        log_info "Prepare openssl ..."
        rm -rf openssl
-        git clone https://github.com/openssl/openssl.git --branch openssl-3.1.2 --depth 1
+        git clone git://git.openssl.org/openssl.git --branch openssl-3.1.2 --depth 1
        mv openssl openssl_x86
        cp -r openssl_x86 openssl_arm

@@ -419,92 +402,9 @@ Usage: %B${functrace[1]%:*}%b <option> [<options>]
        lipo -create openssl_x86/libcrypto.a openssl_arm/libcrypto.a -output openssl-combined/libcrypto.a
        lipo -create openssl_x86/libssl.a openssl_arm/libssl.a -output openssl-combined/libssl.a

-        log_info "Clean up openssl dir ..."
+        log_info "Clean up openssl dir..."
        mv openssl_x86 openssl
        rm -rf openssl_arm
-        popd
-
-        pushd ${project_root}/deps/libusb
-
-        log_info "Configure libusb x86 ..."
-        export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-        export CC=$(xcrun --sdk macosx --find clang)
-        export CXX=$(xcrun --sdk macosx --find clang++)
-        export CFLAGS="-arch x86_64 -isysroot $SDKROOT"
-        export CXXFLAGS="-arch x86_64 -isysroot $SDKROOT"
-        export LDFLAGS="-arch x86_64 -isysroot $SDKROOT"
-        export MACOSX_DEPLOYMENT_TARGET=10.15
-
-        log_info "Building libusb x86 ..."
-        mkdir ${project_root}/deps/libusb/out_x86
-        ./autogen.sh
-        ./configure --host=x86_64-apple-darwin --prefix=${advss_dep_path}
-        make && make install
-
-        log_info "Configure libusb arm ..."
-        make clean
-        rm -r ${project_root}/deps/libusb/out_x86
-        mkdir ${project_root}/deps/libusb/out_x86
-        ./configure --host=aarch64-apple-darwin --prefix=${project_root}/deps/libusb/out_x86
-        make && make install
-
-        log_info "Building libusb arm ..."
-        make clean
-        export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-        export CC=$(xcrun --sdk macosx --find clang)
-        export CXX=$(xcrun --sdk macosx --find clang++)
-        export CFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export CXXFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export LDFLAGS="-arch arm64 -isysroot $SDKROOT"
-        export MACOSX_DEPLOYMENT_TARGET=10.15
-        mkdir ${project_root}/deps/libusb/out_arm
-        ./configure --host=aarch64-apple-darwin --prefix=${project_root}/deps/libusb/out_arm
-        make && make install
-
-        log_info "Combine arm and x86 libusb binaries ..."
-        lipo -create ${project_root}/deps/libusb/out_x86/lib/libusb-1.0.0.dylib \
-          ${project_root}/deps/libusb/out_arm/lib/libusb-1.0.0.dylib \
-          -output ${advss_dep_path}/lib/temp-libusb-1.0.0.dylib
-        mv ${advss_dep_path}/lib/temp-libusb-1.0.0.dylib ${advss_dep_path}/lib/libusb-1.0.0.dylib
-        install_name_tool -id @rpath/libusb-1.0.0.dylib ${advss_dep_path}/lib/libusb-1.0.0.dylib
-        log_info "Clean up libusb ..."
-
-        unset SDKROOT
-        unset CC
-        unset CXX
-        unset CFLAGS
-        unset CXXFLAGS
-        unset LDFLAGS
-        unset MACOSX_DEPLOYMENT_TARGET
-
-        popd
-
-        local mqtt_dir="${project_root}/deps/paho.mqtt.cpp"
-        local mqtt_build_dir="${mqtt_dir}/build_${target##*-}"
-
-        local -a mqtt_cmake_args=(
-          -DCMAKE_BUILD_TYPE=Release
-          -DCMAKE_OSX_ARCHITECTURES=${${target##*-}//universal/x86_64;arm64}
-          -DCMAKE_OSX_DEPLOYMENT_TARGET=${DEPLOYMENT_TARGET:-10.15}
-          -DCMAKE_PREFIX_PATH="${advss_dep_path};${_plugin_deps}"
-          -DCMAKE_INSTALL_PREFIX="${advss_dep_path}"
-          -DPAHO_BUILD_SHARED=OFF
-          -DPAHO_BUILD_STATIC=ON
-          -DPAHO_WITH_MQTT_C=ON
-          -DOPENSSL_ROOT_DIR="${advss_dep_path}"
-          -DPAHO_WITH_SSL=OFF # TODO: figure out linking issues with openssl
-        )
-
-        pushd ${mqtt_dir}
-        log_info "Configure paho.mqtt.cpp ..."
-        cmake -S . -B ${mqtt_build_dir} ${mqtt_cmake_args}
-
-        log_info "Building paho.mqtt.cpp ..."
-        cmake --build ${mqtt_build_dir} --config Release
-
-        log_info "Installing paho.mqtt.cpp ..."
-        cmake --install ${mqtt_build_dir} --prefix "${advss_dep_path}" --config Release
-        popd
      ;;
    linux)
      # Nothing to do for now
--- a/.github/scripts/Build-Deps-Windows.ps1
+++ b/.github/scripts/Build-Deps-Windows.ps1
@@ -199,57 +199,6 @@ function Build {

    Log-Information "Install tesseract..."
    Invoke-External cmake --install "${TesseractBuildPath}" --prefix "${ADVSSDepPath}" @TesseractCmakeArgs
-
-    Push-Location -Stack BuildLibusbTemp
-    Ensure-Location $ProjectRoot
-
-    $LibusbPath = "${ProjectRoot}/deps/libusb"
-
-    Log-Information "Building libusb..."
-    $msbuildExe = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1
-
-    if ($msbuildExe) {
-        Invoke-External $msbuildExe "${LibusbPath}/msvc/libusb.sln" /property:Configuration=Release /property:Platform=x64
-
-        $libusbBuildResultDirectory = "${LibusbPath}/build/v143/x64/Release"
-        if (-not (Test-Path -Path $libusbBuildResultDirectory)) {
-            $libusbBuildResultDirectory = "${LibusbPath}/x64/Release/dll"
-        }
-        Copy-Item -Path "${libusbBuildResultDirectory}/*" -Destination ${ADVSSDepPath} -Recurse -Force
-    } else {
-        Log-Information "Failed to locate msbuild.exe - skipping libusb build"
-    }
-
-    Push-Location -Stack BuildMqttTemp
-    Ensure-Location $ProjectRoot
-
-    $MqttPath = "${ProjectRoot}/deps/paho.mqtt.cpp"
-    $MqttBuildPath = "${MqttPath}/build"
-
-    # Explicitly disable PkgConfig and tiff as it will lead build errors
-    $MqttCmakeArgs = @(
-        "-DCMAKE_BUILD_TYPE=${Configuration}"
-        "-DCMAKE_PREFIX_PATH:PATH=${OBSDepPath}"
-        "-DCMAKE_INSTALL_PREFIX:PATH=${ADVSSDepPath}"
-        "-DPAHO_WITH_MQTT_C=ON"
-    )
-
-    Log-Information "Configuring paho.mqtt.cpp..."
-    Invoke-External cmake -S ${MqttPath} -B ${MqttBuildPath} @MqttCmakeArgs
-
-    $MqttCmakeArgs = @(
-        '--config', "${Configuration}"
-    )
-
-    if ( $VerbosePreference -eq 'Continue' ) {
-        $MqttCmakeArgs += ('--verbose')
-    }
-
-    Log-Information "Building paho.mqtt.cpp..."
-    Invoke-External cmake --build "${MqttBuildPath}" @MqttCmakeArgs
-
-    Log-Information "Install paho.mqtt.cpp..."
-    Invoke-External cmake --install "${MqttBuildPath}" --prefix "${ADVSSDepPath}" @MqttCmakeArgs
 }

 Build
--- a/.github/test
+++ b/.github/test
--- a/.github/workflows/build-debian.yml
+++ b/.github/workflows/build-debian.yml
@@ -43,14 +43,14 @@ jobs:
          # devscripts and libobs-dev are needed but they were already installed
          # from check_libobs_revision and install_frontend_header sections.
          sudo apt update
-          sudo apt install build-essential cmake debhelper libcurl4-openssl-dev libxss-dev libxtst-dev qt6-base-dev libopencv-dev libproc2-dev
+          sudo apt install cmake debhelper libcurl4-openssl-dev libxss-dev libxtst-dev qtbase5-dev libopencv-dev libprocps-dev
      - name: build
        run: |
          debuild --no-lintian --no-sign
          mv ../*.deb .
      - name: Publish
        if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2.2.1
        with:
          name: "obs-scene-switcher.deb"
          path: ${{ github.workspace }}/*.deb
--- a/.github/workflows/build-project.yaml
+++ b/.github/workflows/build-project.yaml
@@ -10,7 +10,7 @@ env:
 jobs:
  check-event:
    name: Check GitHub Event Data 🔎
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    defaults:
      run:
        shell: bash
@@ -75,7 +75,7 @@ jobs:

  macos-build:
    name: Build for macOS 🍏
-    runs-on: macos-14
+    runs-on: macos-13
    needs: check-event
    defaults:
      run:
@@ -107,8 +107,8 @@ jobs:
          print "pluginName=${product_name}" >> $GITHUB_OUTPUT
          print "pluginVersion=${git_tag}" >> $GITHUB_OUTPUT

-          print '::group::Enable Xcode 15.2'
-          sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
+          print '::group::Select Xcode version'
+          sudo xcode-select --switch /Applications/Xcode_14.3.1.app
          print '::endgroup::'

      - uses: actions/cache@v4
@@ -177,7 +177,7 @@ jobs:

  ubuntu-build:
    name: Build for Ubuntu 🐧
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: check-event
    defaults:
      run:
@@ -210,11 +210,6 @@ jobs:
          restore-keys: |
            ${{ runner.os }}-ccache-x86_64-

-      - name: Set up CMake 🏗️
-        uses: jwlawson/actions-setup-cmake@v1.13
-        with:
-          cmake-version: '3.24.x'
-
      - name: Set up Homebrew 🍺
        uses: Homebrew/actions/setup-homebrew@master

@@ -246,14 +241,14 @@ jobs:
      - name: Upload Artifacts 📡
        uses: actions/upload-artifact@v4
        with:
-          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}
+          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-22.04-x86_64-${{ needs.check-event.outputs.commitHash }}
          path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*.*

      - name: Upload debug symbol artifacts 🪲
        uses: actions/upload-artifact@v4
        if: ${{ fromJSON(needs.check-event.outputs.package) }}
        with:
-          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-24.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
+          name: ${{ steps.setup.outputs.pluginName }}-${{ steps.setup.outputs.pluginVersion }}-ubuntu-22.04-x86_64-${{ needs.check-event.outputs.commitHash }}-dbgsym
          path: ${{ github.workspace }}/release/${{ steps.setup.outputs.pluginName }}-*-x86_64*-dbgsym.ddeb

  windows-build:
--- a/.github/workflows/check-format.yaml
+++ b/.github/workflows/check-format.yaml
@@ -3,7 +3,7 @@ on:
  workflow_call:
 jobs:
  clang-format:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
        with:
@@ -15,7 +15,7 @@ jobs:
          failCondition: error

  cmake-format:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    steps:
      - uses: actions/checkout@v4
        with:
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yaml
@@ -31,7 +31,7 @@ jobs:
  create-release:
    name: Create Release 🛫
    if: github.ref_type == 'tag'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
    needs: build-project
    defaults:
      run:
@@ -77,7 +77,7 @@ jobs:
          variants=(
            'windows-x64;zip|exe'
            'macos-universal;tar.xz|pkg'
-            'ubuntu-24.04-x86_64;tar.xz|deb|ddeb'
+            'ubuntu-22.04-x86_64;tar.xz|deb|ddeb'
            'sources;tar.xz'
          )

--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 !/cmake
 !/data
 !/deps
-!/scripting
 !/forms
 !/lib
 !/module
@@ -35,7 +34,4 @@
 .DS_Store

 # Exclude CMake build number cache
-/cmake/.CMakeBuildNumber
-
-# Exclude python caches
-/**/__pycache__
+/cmake/.CMakeBuildNumber
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,15 +25,3 @@
 [submodule "deps/json"]
 	path = deps/json
 	url = https://github.com/nlohmann/json.git
-[submodule "deps/libusb"]
-	path = deps/libusb
-	url = https://github.com/libusb/libusb.git
-[submodule "deps/date"]
-	path = deps/date
-	url = https://github.com/HowardHinnant/date.git
-[submodule "deps/jsoncons"]
-	path = deps/jsoncons
-	url = https://github.com/danielaparker/jsoncons.git
-[submodule "deps/paho.mqtt.cpp"]
-	path = deps/paho.mqtt.cpp
-	url = https://github.com/eclipse-paho/paho.mqtt.cpp.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21...3.26)
+cmake_minimum_required(VERSION 3.16...3.26)

 project(advanced-scene-switcher VERSION 1.0.0)

@@ -20,12 +20,6 @@ if(BUILD_OUT_OF_TREE)
  include(helpers)
 endif()

-# OBS 31 no longer defines find_qt so check if we need to include it for in-tree
-# builds
-if(NOT COMMAND find_qt)
-  include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/helpers_common.cmake")
-endif()
-
 set(LIB_NAME "${PROJECT_NAME}-lib")
 add_library(${PROJECT_NAME} MODULE)
 add_library(${LIB_NAME} SHARED)
@@ -33,11 +27,6 @@ add_library(${LIB_NAME} SHARED)
 include(cmake/common/get_git_revision_description.cmake)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 git_describe(GIT_TAG)
-
-if(${GIT_TAG} STREQUAL "GIT-NOTFOUND")
-  set(GIT_TAG ${PROJECT_VERSION})
-endif()
-message(STATUS "${PROJECT_NAME} version: ${GIT_TAG}")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/version.cpp.in"
               "${CMAKE_CURRENT_BINARY_DIR}/lib/version.cpp" @ONLY)

@@ -63,6 +52,8 @@ target_sources(
  ${LIB_NAME}
  PRIVATE lib/legacy/scene-group.cpp
          lib/legacy/scene-group.hpp
+          lib/legacy/scene-trigger.cpp
+          lib/legacy/scene-trigger.hpp
          lib/legacy/switch-audio.cpp
          lib/legacy/switch-audio.hpp
          lib/legacy/switch-executable.cpp
@@ -75,6 +66,8 @@ target_sources(
          lib/legacy/switch-idle.hpp
          lib/legacy/switch-media.cpp
          lib/legacy/switch-media.hpp
+          lib/legacy/switch-network.cpp
+          lib/legacy/switch-network.hpp
          lib/legacy/switch-pause.cpp
          lib/legacy/switch-pause.hpp
          lib/legacy/switch-random.cpp
@@ -127,16 +120,14 @@ target_sources(
          lib/macro/macro-export-import-dialog.hpp
          lib/macro/macro-helpers.cpp
          lib/macro/macro-helpers.hpp
-          lib/macro/macro-input.cpp
-          lib/macro/macro-input.hpp
          lib/macro/macro-list.cpp
          lib/macro/macro-list.hpp
+          lib/macro/macro-properties.cpp
+          lib/macro/macro-properties.hpp
          lib/macro/macro-ref.cpp
          lib/macro/macro-ref.hpp
          lib/macro/macro-run-button.cpp
          lib/macro/macro-run-button.hpp
-          lib/macro/macro-segment-copy-paste.cpp
-          lib/macro/macro-segment-copy-paste.hpp
          lib/macro/macro-segment-list.cpp
          lib/macro/macro-segment-list.hpp
          lib/macro/macro-segment-selection.cpp
@@ -145,8 +136,6 @@ target_sources(
          lib/macro/macro-segment.hpp
          lib/macro/macro-selection.cpp
          lib/macro/macro-selection.hpp
-          lib/macro/macro-settings.cpp
-          lib/macro/macro-settings.hpp
          lib/macro/macro-tab.cpp
          lib/macro/macro-tree.cpp
          lib/macro/macro-tree.hpp
@@ -160,22 +149,14 @@ target_sources(
          lib/queue/action-queue.hpp
          lib/queue/action-queue-tab.cpp
          lib/queue/action-queue-tab.hpp
-          lib/utils/auto-update-tooltip-label.cpp
-          lib/utils/auto-update-tooltip-label.hpp
          lib/utils/backup.cpp
          lib/utils/backup.hpp
-          lib/utils/condition-logic.cpp
-          lib/utils/condition-logic.hpp
          lib/utils/curl-helper.cpp
          lib/utils/curl-helper.hpp
-          lib/utils/cursor-shape-changer.cpp
-          lib/utils/cursor-shape-changer.hpp
          lib/utils/double-slider.cpp
          lib/utils/double-slider.hpp
          lib/utils/duration-control.cpp
          lib/utils/duration-control.hpp
-          lib/utils/duration-modifier.cpp
-          lib/utils/duration-modifier.hpp
          lib/utils/duration.cpp
          lib/utils/duration.hpp
          lib/utils/export-symbol-helper.hpp
@@ -183,18 +164,10 @@ target_sources(
          lib/utils/file-selection.hpp
          lib/utils/filter-combo-box.cpp
          lib/utils/filter-combo-box.hpp
-          lib/utils/help-icon.hpp
-          lib/utils/help-icon.cpp
          lib/utils/item-selection-helpers.cpp
          lib/utils/item-selection-helpers.hpp
-          lib/utils/json-helpers.cpp
-          lib/utils/json-helpers.hpp
          lib/utils/layout-helpers.cpp
          lib/utils/layout-helpers.hpp
-          lib/utils/list-controls.cpp
-          lib/utils/list-controls.hpp
-          lib/utils/list-editor.cpp
-          lib/utils/list-editor.hpp
          lib/utils/log-helper.cpp
          lib/utils/log-helper.hpp
          lib/utils/math-helpers.cpp
@@ -207,6 +180,7 @@ target_sources(
          lib/utils/name-dialog.hpp
          lib/utils/non-modal-dialog.cpp
          lib/utils/non-modal-dialog.hpp
+          lib/utils/obs-dock.hpp
          lib/utils/obs-module-helper.cpp
          lib/utils/obs-module-helper.hpp
          lib/utils/path-helpers.cpp
@@ -221,6 +195,8 @@ target_sources(
          lib/utils/resizing-text-edit.hpp
          lib/utils/resource-table.cpp
          lib/utils/resource-table.hpp
+          lib/utils/resource-table-hotkey-handler.cpp
+          lib/utils/resource-table-hotkey-handler.hpp
          lib/utils/scene-selection.cpp
          lib/utils/scene-selection.hpp
          lib/utils/scene-switch-helpers.cpp
@@ -243,8 +219,6 @@ target_sources(
          lib/utils/splitter-helpers.hpp
          lib/utils/status-control.cpp
          lib/utils/status-control.hpp
-          lib/utils/string-list.cpp
-          lib/utils/string-list.hpp
          lib/utils/switch-button.cpp
          lib/utils/switch-button.hpp
          lib/utils/sync-helpers.cpp
@@ -253,16 +227,12 @@ target_sources(
          lib/utils/tab-helpers.hpp
          lib/utils/temp-variable.cpp
          lib/utils/temp-variable.hpp
-          lib/utils/time-helpers.cpp
-          lib/utils/time-helpers.hpp
          lib/utils/ui-helpers.cpp
          lib/utils/ui-helpers.hpp
          lib/utils/utility.cpp
          lib/utils/utility.hpp
          lib/utils/volume-control.cpp
          lib/utils/volume-control.hpp
-          lib/utils/websocket-api.cpp
-          lib/utils/websocket-api.hpp
          lib/variables/variable-line-edit.cpp
          lib/variables/variable-line-edit.hpp
          lib/variables/variable-number.hpp
@@ -280,25 +250,13 @@ target_sources(

 # --- End of section ---

-# Subfolder for advanced scene switcher plugins
-set(ADVSS_PLUGIN_FOLDER "advanced-scene-switcher-plugins")
-target_compile_definitions(
-  ${LIB_NAME} PRIVATE ADVSS_PLUGIN_FOLDER=\"${ADVSS_PLUGIN_FOLDER}\")
-
 include(cmake/common/advss_helpers.cmake)
 setup_obs_lib_dependency(${LIB_NAME})
 setup_obs_lib_dependency(${PROJECT_NAME})

-find_package(Qt6 REQUIRED COMPONENTS Widgets Core)
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Widgets)
-target_link_libraries(${LIB_NAME} PRIVATE Qt6::Core Qt6::Widgets)
-
-# Ignore QCheckBox::stateChanged deprecation warning until minimum supported Qt
-# version is at least Qt 6.7, which introduces QCheckBox::checkStateChanged
-if(Qt6_VERSION VERSION_GREATER "6.0.0")
-  target_compile_definitions(${LIB_NAME} PRIVATE QT_NO_DEPRECATED_WARNINGS)
-endif()
-
+find_qt(COMPONENTS Widgets Core)
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt::Core Qt::Widgets)
+target_link_libraries(${LIB_NAME} PRIVATE Qt::Core Qt::Widgets)
 target_compile_options(
  ${PROJECT_NAME}
  PRIVATE
@@ -335,9 +293,13 @@ set_target_properties(${LIB_NAME} PROPERTIES CXX_VISIBILITY_PRESET hidden)
 target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17)
 target_compile_features(${LIB_NAME} PUBLIC cxx_std_17)

+add_definitions(-DASIO_STANDALONE)
 target_include_directories(
-  ${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib"
-                     "${CMAKE_CURRENT_SOURCE_DIR}/deps/exprtk")
+  ${LIB_NAME}
+  PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/deps/asio/asio/include"
+         "${CMAKE_CURRENT_SOURCE_DIR}/deps/websocketpp"
+         "${CMAKE_CURRENT_SOURCE_DIR}/deps/obs-websocket/lib"
+         "${CMAKE_CURRENT_SOURCE_DIR}/deps/exprtk")

 if(NOT nlohmann_json_DIR
   AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/json/CMakeLists.txt")
@@ -347,21 +309,6 @@ else()
 endif()
 target_link_libraries(${LIB_NAME} PUBLIC nlohmann_json::nlohmann_json)

-if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/jsoncons/CMakeLists.txt")
-  # Don't build jsoncons unit tests as they are causing compilation issues and
-  # won't be executed either way
-  if(OS_MACOS)
-    cmake_policy(SET CMP0077 NEW)
-  endif()
-  set(JSONCONS_BUILD_TESTS
-      OFF
-      CACHE BOOL "" FORCE)
-
-  add_subdirectory(deps/jsoncons EXCLUDE_FROM_ALL)
-  target_link_libraries(${LIB_NAME} PRIVATE jsoncons)
-  target_compile_definitions(${LIB_NAME} PRIVATE JSONPATH_SUPPORT=1)
-endif()
-
 find_package(CURL QUIET)
 find_package(Libcurl QUIET)
 if(CURL_FOUND)
@@ -388,9 +335,6 @@ if(OS_WINDOWS)
  if(MSVC)
    target_compile_options(${LIB_NAME} PUBLIC /MP /d2FH4- /wd4267 /wd4267
                                              /bigobj)
-
-    # Workaround for MSVC incompatibility in CI environment
-    add_compile_definitions(${target_name} _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
  endif()
  target_sources(${LIB_NAME} PRIVATE lib/win/advanced-scene-switcher-win.cpp)
  add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
@@ -415,7 +359,6 @@ else()
  set_target_properties(${LIB_NAME} PROPERTIES PREFIX "")
  set_target_properties(${LIB_NAME} PROPERTIES SOVERSION 1)

-  find_package(Qt6 REQUIRED COMPONENTS DBus)
  find_package(X11 REQUIRED COMPONENTS Xss)
  target_include_directories(${LIB_NAME} PRIVATE "${X11_INCLUDE_DIR}"
                                                 "${X11_Xss_INCLUDE_PATH}")
@@ -430,12 +373,7 @@ else()
    set(PROCESS_CONDITION_SUPPORTED 1)
  endif()
  if(PROCPS2_INCLUDE_DIR)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(libproc2 IMPORTED_TARGET libproc2<4.0.5 QUIET)
-    if(libproc2_FOUND)
-      target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_USE_INFO)
-    endif()
-    pkg_check_modules(libproc2 REQUIRED IMPORTED_TARGET libproc2)
+    message(STATUS "${PROJECT_NAME} using libproc2")
    set(PROC_INCLUDE_DIR "${PROCPS2_INCLUDE_DIR}")
    target_compile_definitions(${LIB_NAME} PRIVATE PROCPS2_AVAILABLE)
    set(PROCESS_CONDITION_SUPPORTED 1)
@@ -447,18 +385,15 @@ else()
    )
  endif()
  target_include_directories(${LIB_NAME} PRIVATE "${PROC_INCLUDE_DIR}")
-  target_sources(${LIB_NAME} PRIVATE lib/linux/advanced-scene-switcher-nix.cpp
-                                     lib/linux/kwin-helpers.cpp)
-
-  # Don't include irrelevant folders into sources archive
-  list(APPEND CPACK_SOURCE_IGNORE_FILES "\\.deps/.*")
+  target_sources(${LIB_NAME} PRIVATE lib/linux/advanced-scene-switcher-nix.cpp)
 endif()

 if(NOT OS_WINDOWS)
  target_compile_options(
    ${LIB_NAME}
    PUBLIC -Wno-error=unused-parameter -Wno-error=conversion -Wno-error=shadow
-           -Wno-error=float-conversion -Wno-error=enum-conversion)
+           -Wno-error=float-conversion -Wno-error=enum-conversion
+           -Wno-error=deprecated-declarations)
 endif()

 # --- End of section ---
--- a/README.md
+++ b/README.md
@@ -19,11 +19,8 @@ The **Snap** package manager offers an OBS Studio installation which is bundled
 sudo snap install obs-studio
 ```

-More information can be found [here](https://github.com/WarmUpTill/SceneSwitcher/wiki/Installation).
-
 ## Contributing

 - If you wish to contribute code to the project, have a look at this [section](BUILDING.md) describing how to compile the plugin.
- You can add custom conditions and actions at runtime using the API described [here](https://github.com/WarmUpTill/SceneSwitcher/wiki/Scripting).
 - You can optionally use [pre-commit](https://pre-commit.com) to automatically handle formatting.
 - If you wish to contribute translations, feel free to submit pull requests for the corresponding files under `data/locale`.
--- a/build-aux/CI/check-locale.py
+++ b/build-aux/CI/check-locale.py
@@ -6,27 +6,17 @@ import re
 import sys

 defaultLocaleFile = "en-US.ini"
-commentChars = ";#"


 class localeEntry:
    locale = ""
    widgetPlaceholders = []
    qStringArgs = []
-    lineNum = -1

-    def __init__(self, locale, widgetPlaceholders, qStringArgs, lineNum) -> None:
+    def __init__(self, locale, widgetPlaceholders, qStringArgs) -> None:
        self.locale = locale
        self.widgetPlaceholders = widgetPlaceholders
        self.qStringArgs = qStringArgs
-        self.lineNum = lineNum
-
-
-def isCommentLine(line):
-    for char in commentChars:
-        if line.startswith(char):
-            return True
-    return False


 def getNonDefaultLocales(dir):
@@ -42,11 +32,11 @@ def getNonDefaultLocales(dir):
 def getAllLocaleEntries(file):
    localeEntries = []
    with open(file, "r", encoding="UTF-8") as f:
-        for lineNum, line in enumerate(f):
+        for line in f.readlines():
            widgetPlaceholders = []
            qStringArgs = []

-            if isCommentLine(line):
+            if line.startswith(";"):
                continue

            for word in line.split("{{"):
@@ -59,9 +49,7 @@ def getAllLocaleEntries(file):
                qStringArgs.append(match.group(0))

            localeEntries.append(
-                localeEntry(
-                    line.split("=")[0], widgetPlaceholders, qStringArgs, lineNum + 1
-                )
+                localeEntry(line.split("=")[0], widgetPlaceholders, qStringArgs)
            )

    return localeEntries
@@ -85,8 +73,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
        if expectedLocaleEntry is None:
            result = False
            print(
-                'ERROR: Locale entry "{}" from "{}:{}" not found in "{}"'.format(
-                    localeEntry.locale, file, localeEntry.lineNum, defaultLocaleFile
+                'ERROR: Locale entry "{}" from "{}" not found in "{}"'.format(
+                    localeEntry.locale, file, defaultLocaleFile
                )
            )
            continue
@@ -95,13 +83,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
            if placeholder not in expectedLocaleEntry.widgetPlaceholders:
                result = False
                print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does contain "{}" widget placeholder while "{}:{}" does not'.format(
-                        localeEntry.locale,
-                        file,
-                        localeEntry.lineNum,
-                        placeholder,
-                        defaultLocaleFile,
-                        expectedLocaleEntry.lineNum,
+                    'ERROR: Locale entry "{}" from "{}" does contain "{}" widget placeholder while "{}" does not'.format(
+                        localeEntry.locale, file, placeholder, defaultLocaleFile
                    )
                )

@@ -109,8 +92,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
            if placeholder not in localeEntry.widgetPlaceholders:
                result = False
                print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does not contain "{}" widget placeholder'.format(
-                        localeEntry.locale, file, localeEntry.lineNum, placeholder
+                    'ERROR: Locale entry "{}" from "{}" does not contain "{}" widget placeholder'.format(
+                        localeEntry.locale, file, placeholder
                    )
                )

@@ -118,13 +101,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
            if arg not in expectedLocaleEntry.qStringArgs:
                result = False
                print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does contain "{}" QString arg while "{}:{}" does not'.format(
-                        localeEntry.locale,
-                        file,
-                        localeEntry.lineNum,
-                        arg,
-                        defaultLocaleFile,
-                        expectedLocaleEntry.lineNum,
+                    'ERROR: Locale entry "{}" from "{}" does contain "{}" QString arg while "{}" does not'.format(
+                        localeEntry.locale, file, arg, defaultLocaleFile
                    )
                )

@@ -132,8 +110,8 @@ def checkLocaleEntries(file, expectedLocaleEntries):
            if arg not in localeEntry.qStringArgs:
                result = False
                print(
-                    'ERROR: Locale entry "{}" from "{}:{}" does not contain "{}" QString arg'.format(
-                        localeEntry.locale, file, localeEntry.lineNum, arg
+                    'ERROR: Locale entry "{}" from "{}" does not contain "{}" QString arg'.format(
+                        localeEntry.locale, file, arg
                    )
                )

--- a/build-aux/CI/linux/debian/control
+++ b/build-aux/CI/linux/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cmake,
               libcurl4-openssl-dev,
               libobs-dev,
               libxtst-dev,
-               qt6-base-dev,
+               qtbase5-dev,
               libxss-dev,
               libopencv-dev
 Standards-Version: 4.6.0
--- a/build-aux/CI/linux/debian/rules
+++ b/build-aux/CI/linux/debian/rules
@@ -3,7 +3,7 @@

 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

-export QT_SELECT = qt6
+export QT_SELECT = qt5

 %:
 	dh $@
--- a/buildspec.json
+++ b/buildspec.json
@@ -1,33 +1,33 @@
 {
    "dependencies": {
        "obs-studio": {
-            "version": "30.1.2",
+            "version": "29.1.2",
            "baseUrl": "https://github.com/obsproject/obs-studio/archive/refs/tags",
            "label": "OBS sources",
            "hashes": {
-                "macos": "490bae1c392b3b344b0270afd8cb887da4bc50bd92c0c426e96713c1ccb9701a",
-                "windows-x64": "c2dd03fa7fd01fad5beafce8f7156da11f9ed9a588373fd40b44a06f4c03b867"
+                "macos": "215f1fa5772c5dd9f3d6e35b0cb573912b00320149666a77864f9d305525504b",
+                "windows-x64": "46d451f3f42b9d2c59339ec268165849c7b7904cdf1cc2a8d44c015815a9e37d"
            }
        },
        "prebuilt": {
-            "version": "2024-03-19",
+            "version": "2023-04-12",
            "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
            "label": "Pre-Built obs-deps",
            "hashes": {
-                "macos": "2e9bfb55a5e0e4c1086fa1fda4cf268debfead473089df2aaea80e1c7a3ca7ff",
-                "windows-x64": "6e86068371526a967e805f6f9903f9407adb683c21820db5f07da8f30d11e998"
+                "macos": "9535c6e1ad96f7d49960251e85a245774088d48da1d602bb82f734b10219125a",
+                "windows-x64": "c13a14a1acc4224b21304d97b63da4121de1ed6981297e50496fbc474abc0503"
            }
        },
        "qt6": {
-            "version": "2024-03-19",
+            "version": "2023-04-12",
            "baseUrl": "https://github.com/obsproject/obs-deps/releases/download",
            "label": "Pre-Built Qt6",
            "hashes": {
-                "macos": "694f1e639c017e3b1f456f735330dc5afae287cbea85757101af1368de3142c8",
-                "windows-x64": "72d1df34a0ef7413a681d5fcc88cae81da60adc03dcd23ef17862ab170bcc0dd"
+                "macos": "eb7614544ab4f3d2c6052c797635602280ca5b028a6b987523d8484222ce45d1",
+                "windows-x64": "4d39364b8a8dee5aa24fcebd8440d5c22bb4551c6b440ffeacce7d61f2ed1add"
            },
            "debugSymbols": {
-                "windows-x64": "fbddd1f659c360f2291911ac5709b67b6f8182e6bca519d24712e4f6fd3cc865"
+                "windows-x64": "f34ee5067be19ed370268b15c53684b7b8aaa867dc800b68931df905d679e31f"
            }
        }
    },
--- a/cmake/common/advss_helpers.cmake
+++ b/cmake/common/advss_helpers.cmake
@@ -8,11 +8,14 @@ if(BUILD_OUT_OF_TREE)
  endif()
 endif()

+# Subfolder for advanced scene switcher plugins
+set(_PLUGIN_FOLDER "adv-ss-plugins")
+
 # --- MACOS section ---
 if(OS_MACOS)
  set(ADVSS_BUNDLE_DIR "advanced-scene-switcher.plugin")
  set(ADVSS_BUNDLE_MODULE_DIR "${ADVSS_BUNDLE_DIR}/Contents/MacOS")
-  set(ADVSS_BUNDLE_PLUGIN_DIR ${ADVSS_BUNDLE_MODULE_DIR}/${ADVSS_PLUGIN_FOLDER})
+  set(ADVSS_BUNDLE_PLUGIN_DIR ${ADVSS_BUNDLE_MODULE_DIR}/${_PLUGIN_FOLDER})

  function(install_advss_lib_helper target where)
    install(
@@ -57,36 +60,10 @@ if(OS_MACOS)
      ${dep}_Development)
  endfunction()

-  function(install_advss_plugin_dependency_file target dep)
-    get_filename_component(_FILENAME ${dep} NAME)
-    string(REGEX REPLACE "\\.[^.]*$" "" _FILENAMENOEXT ${_FILENAME})
-    set(_DEP_NAME "${target}-${_FILENAMENOEXT}")
-
-    install(
-      FILES "${dep}"
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT ${_DEP_NAME}_Runtime
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT ${_DEP_NAME}_Runtime
-      NAMELINK_COMPONENT ${_DEP_NAME}_Development)
-
-    install(
-      FILES "${dep}"
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT obs_${_DEP_NAME}
-      EXCLUDE_FROM_ALL
-      DESTINATION "${ADVSS_BUNDLE_PLUGIN_DIR}"
-      COMPONENT obs_${_DEP_NAME}
-      EXCLUDE_FROM_ALL)
-
-    add_custom_command(
-      TARGET ${target}
-      POST_BUILD
-      COMMAND
-        "${CMAKE_COMMAND}" --install ${CMAKE_CURRENT_BINARY_DIR} --config
-        $<CONFIG> --prefix ${CMAKE_INSTALL_PREFIX} --component obs_${_DEP_NAME}
-      COMMENT "Installing ${_DEP_NAME} to OBS rundir\n"
-      VERBATIM)
+  function(install_advss_plugin_dependency_file ${target} dep)
+    target_sources(advanced-scene-switcher PRIVATE ${dep})
+    set_source_files_properties(${dep} PROPERTIES MACOSX_PACKAGE_LOCATION
+                                                  ${ADVSS_BUNDLE_PLUGIN_DIR})
  endfunction()

  # --- End of section ---
@@ -151,8 +128,8 @@ else()

  function(install_advss_plugin target)
    plugin_install_helper(
-      "${target}" "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
-      "${ADVSS_PLUGIN_FOLDER}")
+      "${target}" "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
+      "${_PLUGIN_FOLDER}")
    if(NOT OS_WINDOWS)
      set_target_properties(${target} PROPERTIES INSTALL_RPATH
                                                 "$ORIGIN:$ORIGIN/..")
@@ -166,12 +143,12 @@ else()
      ${dep}
      RUNTIME
      DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT
      ${dep}_Runtime
      LIBRARY
      DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT
      ${dep}_Runtime
      NAMELINK_COMPONENT
@@ -182,13 +159,13 @@ else()
      ${dep}
      RUNTIME
      DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT
      obs_${dep}
      EXCLUDE_FROM_ALL
      LIBRARY
      DESTINATION
-      "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT
      obs_${dep}
      EXCLUDE_FROM_ALL)
@@ -211,18 +188,18 @@ else()

    install(
      FILES "${dep}"
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT ${_DEP_NAME}_Runtime
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT ${_DEP_NAME}_Runtime
      NAMELINK_COMPONENT ${_DEP_NAME}_Development)

    install(
      FILES "${dep}"
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT obs_${_DEP_NAME}
      EXCLUDE_FROM_ALL
-      DESTINATION "${OBS_PLUGIN_DESTINATION}/${ADVSS_PLUGIN_FOLDER}"
+      DESTINATION "${OBS_PLUGIN_DESTINATION}/${_PLUGIN_FOLDER}"
      COMPONENT obs_${_DEP_NAME}
      EXCLUDE_FROM_ALL)

@@ -283,14 +260,8 @@ endfunction()

 function(setup_advss_plugin target)
  setup_obs_lib_dependency(${target})
-  find_package(Qt6 REQUIRED COMPONENTS Widgets Core)
-  target_link_libraries(${target} PRIVATE Qt6::Core Qt6::Widgets)
-
-  # Ignore QCheckBox::stateChanged deprecation warning until minimum supported
-  # Qt version is at least Qt 6.7, which introduces QCheckBox::checkStateChanged
-  if(Qt6_VERSION VERSION_GREATER "6.7.0")
-    target_compile_definitions(${target} PRIVATE QT_NO_DEPRECATED_WARNINGS)
-  endif()
+  find_qt(COMPONENTS Widgets Core)
+  target_link_libraries(${target} PRIVATE Qt::Core Qt::Widgets)

  set_target_properties(
    ${target}
@@ -338,6 +309,7 @@ function(install_advss_plugin_dependency)
  if(NOT PARSED_ARGS_TARGET)
    message(FATAL_ERROR "You must provide a target")
  endif()
+  set(_PLUGIN_FOLDER "adv-ss-plugins")
  foreach(_DEPENDENCY ${PARSED_ARGS_DEPENDENCIES})
    if(EXISTS ${_DEPENDENCY})
      install_advss_plugin_dependency_file(${PARSED_ARGS_TARGET} ${_DEPENDENCY})
--- a/cmake/common/helpers_common.cmake
+++ b/cmake/common/helpers_common.cmake
@@ -17,6 +17,85 @@ if(NOT QT_VERSION)
  set_property(CACHE QT_VERSION PROPERTY STRINGS AUTO 5 6)
 endif()

+# find_qt: Macro to find best possible Qt version for use with the project:
+macro(find_qt)
+  set(multiValueArgs COMPONENTS COMPONENTS_WIN COMPONENTS_MAC COMPONENTS_LINUX)
+  cmake_parse_arguments(find_qt "" "${oneValueArgs}" "${multiValueArgs}"
+                        ${ARGN})
+
+  # Do not use versionless targets in the first step to avoid Qt::Core being
+  # clobbered by later opportunistic find_package runs
+  set(QT_NO_CREATE_VERSIONLESS_TARGETS TRUE)
+
+  message(DEBUG "Start Qt version discovery...")
+  # Loop until _QT_VERSION is set or FATAL_ERROR aborts script execution early
+  while(NOT _QT_VERSION)
+    message(DEBUG "QT_VERSION set to ${QT_VERSION}")
+    if(QT_VERSION STREQUAL AUTO AND NOT qt_test_version)
+      set(qt_test_version 6)
+    elseif(NOT QT_VERSION STREQUAL AUTO)
+      set(qt_test_version ${QT_VERSION})
+    endif()
+    message(DEBUG "Attempting to find Qt${qt_test_version}")
+
+    find_package(
+      Qt${qt_test_version}
+      COMPONENTS Core
+      QUIET)
+
+    if(TARGET Qt${qt_test_version}::Core)
+      set(_QT_VERSION
+          ${qt_test_version}
+          CACHE INTERNAL "")
+      message(STATUS "Qt version found: ${_QT_VERSION}")
+      unset(qt_test_version)
+      break()
+    elseif(QT_VERSION STREQUAL AUTO)
+      if(qt_test_version EQUAL 6)
+        message(WARNING "Qt6 was not found, falling back to Qt5")
+        set(qt_test_version 5)
+        continue()
+      endif()
+    endif()
+    message(FATAL_ERROR "Neither Qt6 nor Qt5 found.")
+  endwhile()
+
+  # Enable versionless targets for the remaining Qt components
+  set(QT_NO_CREATE_VERSIONLESS_TARGETS FALSE)
+
+  set(qt_components ${find_qt_COMPONENTS})
+  if(OS_WINDOWS)
+    list(APPEND qt_components ${find_qt_COMPONENTS_WIN})
+  elseif(OS_MACOS)
+    list(APPEND qt_components ${find_qt_COMPONENTS_MAC})
+  else()
+    list(APPEND qt_components ${find_qt_COMPONENTS_LINUX})
+  endif()
+  message(DEBUG "Trying to find Qt components ${qt_components}...")
+
+  find_package(Qt${_QT_VERSION} REQUIRED ${qt_components})
+
+  list(APPEND qt_components Core)
+
+  if("Gui" IN_LIST find_qt_COMPONENTS_LINUX)
+    list(APPEND qt_components "GuiPrivate")
+  endif()
+
+  # Check for versionless targets of each requested component and create if
+  # necessary
+  foreach(component IN LISTS qt_components)
+    message(DEBUG "Checking for target Qt::${component}")
+    if(NOT TARGET Qt::${component} AND TARGET Qt${_QT_VERSION}::${component})
+      add_library(Qt::${component} INTERFACE IMPORTED)
+      set_target_properties(
+        Qt::${component} PROPERTIES INTERFACE_LINK_LIBRARIES
+                                    Qt${_QT_VERSION}::${component})
+    endif()
+    set_property(TARGET Qt::${component} PROPERTY INTERFACE_COMPILE_FEATURES "")
+  endforeach()
+
+endmacro()
+
 # check_uuid: Helper function to check for valid UUID
 function(check_uuid uuid_string return_value)
  set(valid_uuid TRUE)
--- a/cmake/windows/helpers.cmake
+++ b/cmake/windows/helpers.cmake
@@ -80,8 +80,6 @@ function(set_target_properties_plugin target)

  configure_file(cmake/windows/resources/installer-Windows.iss.in
                 "${CMAKE_CURRENT_BINARY_DIR}/installer-Windows.generated.iss")
-  configure_file(data/res/images/logo.ico
-                 "${CMAKE_CURRENT_BINARY_DIR}/installer.ico" COPYONLY)

  configure_file(cmake/windows/resources/resource.rc.in
                 "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.rc")
--- a/cmake/windows/resources/installer-Windows.iss.in
+++ b/cmake/windows/resources/installer-Windows.iss.in
@@ -20,8 +20,6 @@ OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Windows-Installer
 Compression=lzma
 SolidCompression=yes
 DirExistsWarning=no
-SetupIconFile=installer.ico
-UninstallDisplayIcon={app}\data\obs-plugins\advanced-scene-switcher\res\images\logo.ico

 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
--- a/data/locale/de-DE.ini
+++ b/data/locale/de-DE.ini
@@ -19,13 +19,14 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Streamen"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Aufnehmen oder Streamen"
 AdvSceneSwitcher.generalTab.status.checkInterval="Teste Bedingungen alle"
 AdvSceneSwitcher.generalTab.generalBehavior="Allgemeines Verhalten"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Wenn keine Bedingung erfüllt ist für "
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Kann nur so genau sein wie das eingestellte Interval zum Testen der Bedingungen."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Nicht wechseln"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Wechsle zu einer Szene auf dem Zufall-Tab"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Wechsle zu:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Wenn keine Bedingung erfüllt ist für "
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Kann nur so genau sein wie das eingestellte Interval zum Testen der Bedingungen."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Nicht wechseln"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Wechsle zu einer Szene auf dem Zufall-Tab"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Wechsle zu:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="Nach Ausführen von Aktionen überspringe das Ausführen von Aktionen für"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="In diesem Zeitraum werden potentielle erfüllte Bedingungen ignoriert!"
+AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Ausführliches Logging"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Fensterposition und -größe speichern"
 AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Benachrichtigungen im System-Tray anzeigen"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Deaktiviere UI Tipps"
@@ -40,7 +41,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exportieren"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importieren"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exportiere Erweiterter Automatischer Szenenwechsler Einstellungen zu Datei ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Exportiere Erweiterter Automatischer Szenenwechsler Einstellungen von Datei ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text Dateien (*.txt *.json)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text Dateien (*.txt)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Importieren der Einstellungen ist fehlgeschlagen"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Einstellungen wurden erfolgreich importiert"
 AdvSceneSwitcher.generalTab.priority.fileContent="Datei Inhalt"
@@ -93,7 +94,7 @@ AdvSceneSwitcher.macroTab.highlightExecutedMacros="Kürzlich ausgeführte Makros
 AdvSceneSwitcher.macroTab.highlightTrueConditions="Bedingungen des aktuell ausgewählten Makros hervorheben, die kürzlich als wahr bewertet wurden"
 AdvSceneSwitcher.macroTab.highlightPerformedActions="Zuletzt ausgeführte Aktionen des aktuell ausgewählten Makros hervorheben"
 AdvSceneSwitcher.macroTab.newMacroRegisterHotkey="Hotkeys zur Steuerung des Pausen-Status neuer Makros registrieren"
-AdvSceneSwitcher.macroTab.currentRegisterHotkeys="Hotkeys zur Steuerung des Pausen-Status ausgewählter Makros registrieren"
+AdvSceneSwitcher.macroTab.currentDisableHotkeys="Hotkeys zur Steuerung des Pausen-Status ausgewählter Makros registrieren"

 ; Macro List
 AdvSceneSwitcher.macroList.deleted="gelöscht"
@@ -141,6 +142,8 @@ AdvSceneSwitcher.condition.scene.type.currentPattern="Aktuelle Szene entspricht"
 AdvSceneSwitcher.condition.scene.type.previousPattern="Vorherige Szene entspricht"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Während des Übergangs die Ziel-Szene überprüfen"
 AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="Während des Übergangs die Quell-Szene überprüfen"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="Fenster"
 AdvSceneSwitcher.condition.file="Datei"
 AdvSceneSwitcher.condition.file.type.match="entspricht"
@@ -156,7 +159,7 @@ AdvSceneSwitcher.condition.media.source="Quelle"
 AdvSceneSwitcher.condition.media.anyOnScene="Beliebige Medienquelle in"
 AdvSceneSwitcher.condition.media.allOnScene="Alle Medienquellen in"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="Leider verhalten sich nicht alle Medien-Quell-Typen gleich (z.B. Medien-Quelle vs. VLC-Video-Quelle \"Gestoppt\"-Status).\nBitte experimentieren, was in eurem Setup funktioniert!"
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}Status ist{{states}}und{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}}Status ist{{states}}und{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="entspricht genau"
 AdvSceneSwitcher.condition.video.condition.differ="stimmt nicht überein"
@@ -194,12 +197,12 @@ AdvSceneSwitcher.condition.video.modelLoadFail="Modelldaten konnten nicht gelade
 AdvSceneSwitcher.condition.video.type.main="OBS's Haupt-Ausgabe"
 AdvSceneSwitcher.condition.video.type.source="Quelle"
 AdvSceneSwitcher.condition.video.type.scene="Szene"
-AdvSceneSwitcher.condition.video.layout="{{videoInputTypes}}{{sources}}{{scenes}}{{condition}}{{imagePath}}"
-AdvSceneSwitcher.condition.video.layout.modelPath="Modelldaten (Haar-Kaskaden-Klassifikator): {{modelDataPath}}"
-AdvSceneSwitcher.condition.video.layout.minNeighbor="Minimale Anzahl von Nachbarn: {{minNeighbors}}"
-AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Reduzieren Sie die CPU-Belastung, indem Sie die Prüfung nur alle {{throttleCount}} Millisekunden"
-AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Kontrolle nur im Bereich durchführen"
-AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
+AdvSceneSwitcher.condition.video.entry="{{videoInputTypes}}{{sources}}{{scenes}}{{condition}}{{imagePath}}"
+AdvSceneSwitcher.condition.video.entry.modelPath="Modelldaten (Haar-Kaskaden-Klassifikator): {{modelDataPath}}"
+AdvSceneSwitcher.condition.video.entry.minNeighbor="Minimale Anzahl von Nachbarn: {{minNeighbors}}"
+AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}Reduzieren Sie die CPU-Belastung, indem Sie die Prüfung nur alle {{throttleCount}} Millisekunden"
+AdvSceneSwitcher.condition.video.entry.checkAreaEnable="Kontrolle nur im Bereich durchführen"
+AdvSceneSwitcher.condition.video.entry.checkArea="{{checkAreaEnable}}{{checkArea}}{{selectArea}}"
 AdvSceneSwitcher.condition.video.minSize="Minimale Größe:"
 AdvSceneSwitcher.condition.video.maxSize="Maximale Größe:"
 AdvSceneSwitcher.condition.video.selectArea="Bereich auswählen"
@@ -211,6 +214,7 @@ AdvSceneSwitcher.condition.stream.state.start="Stream läuft"
 AdvSceneSwitcher.condition.stream.state.stop="Stream gestoppt"
 AdvSceneSwitcher.condition.stream.state.starting="Stream wird gestartet"
 AdvSceneSwitcher.condition.stream.state.stopping="Stream wird gestoppt"
+AdvSceneSwitcher.condition.stream.entry="{{streamState}}{{keyFrameInterval}}"
 AdvSceneSwitcher.condition.record="Aufnahme"
 AdvSceneSwitcher.condition.record.state.start="Aufnahme läuft"
 AdvSceneSwitcher.condition.record.state.pause="Aufnahme pausiert"
@@ -317,8 +321,11 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="Nächster Treffer bei: %1"
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Bei Wiederholung ausgewähltes Datum auf Wiederholungsdatum aktualisieren"
 AdvSceneSwitcher.condition.sceneTransform="Szenenelement transformieren"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Transformation erhalten"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="entspricht Transformation"
-AdvSceneSwitcher.condition.sceneTransform.condition.changed="hat sich geändert"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="Auf{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="entspricht Transformation"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.changed="hat sich geändert"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="Übergang"
 AdvSceneSwitcher.condition.transition.type.current="Aktueller Übergangstyp ist"
 AdvSceneSwitcher.condition.transition.type.duration="Aktuelle Übergangsdauer beträgt"
@@ -420,6 +427,7 @@ AdvSceneSwitcher.action.replay.saveWarn="Warnung: Ein zu häufiges Speichern kan
 AdvSceneSwitcher.action.replay.type.stop="Replay Buffer stoppen"
 AdvSceneSwitcher.action.replay.type.start="Replay Buffer starten"
 AdvSceneSwitcher.action.replay.type.save="Replay Buffer speichern"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Stream"
 AdvSceneSwitcher.action.streaming.type.stop="Stream stoppen"
 AdvSceneSwitcher.action.streaming.type.start="Stream starten"
@@ -461,6 +469,7 @@ AdvSceneSwitcher.action.macro.type.unpause="Nicht mehr pausieren"
 AdvSceneSwitcher.action.macro.type.resetCounter="Zähler zurücksetzen"
 AdvSceneSwitcher.action.macro.type.run="Aktionen ausführen"
 AdvSceneSwitcher.action.macro.type.stop="Aktionen stoppen"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Plugin-Status"
 AdvSceneSwitcher.action.pluginState.type.stop="Erweiterten Automatischen Szenenwechsler stoppen"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Ändern des Nichtübereinstimmungsverhaltens:"
@@ -488,10 +497,10 @@ AdvSceneSwitcher.action.sceneOrder.type.moveDown="Nach unten verschieben"
 AdvSceneSwitcher.action.sceneOrder.type.moveTop="An erste Stelle verschieben"
 AdvSceneSwitcher.action.sceneOrder.type.moveBottom="An letzte Stelle verschieben"
 AdvSceneSwitcher.action.sceneOrder.type.movePosition="An Position verschieben"
-AdvSceneSwitcher.action.sceneOrder.entry="Auf{{scenes}}{{actions}}{{sources}}{{sources2}}{{position}}"
+AdvSceneSwitcher.action.sceneOrder.entry="Auf{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Szenenelement transformieren"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Transformation erhalten"
-AdvSceneSwitcher.action.sceneTransform.entry="Auf{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="Auf{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Datei"
 AdvSceneSwitcher.action.file.type.write="Schreiben"
 AdvSceneSwitcher.action.file.type.append="Anhängen"
@@ -525,8 +534,9 @@ AdvSceneSwitcher.action.screenshot.save.default="Standard"
 AdvSceneSwitcher.action.screenshot.save.custom="Benutzerdefiniert"
 AdvSceneSwitcher.action.screenshot.type.source="Quelle"
 AdvSceneSwitcher.action.screenshot.type.scene="Szene"
+AdvSceneSwitcher.action.screenshot.mainOutput="OBS's Haupt-Ausgabe"
 AdvSceneSwitcher.action.screenshot.blackscreenNote="Quellen oder Szenen, die nicht immer gerendert werden, können dazu führen, dass einige Teile der Screenshots leer bleiben."
-AdvSceneSwitcher.action.screenshot.entry="Screenshot{{targetType}}{{sources}}{{scenes}}und speichere in{{saveType}}{{variables}}Pfad"
+AdvSceneSwitcher.action.screenshot.entry="Screenshot{{targetType}}{{sources}}{{scenes}}und speichere in{{saveType}}Pfad"
 AdvSceneSwitcher.action.profile="Profil"
 AdvSceneSwitcher.action.profile.entry="Aktives Profil umschalten auf {{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="Szenensammlung"
@@ -725,6 +735,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="außer Video Quelle ist inaktiv"
 AdvSceneSwitcher.videoTab.entry="Wenn {{videoSources}} {{condition}} {{filePath}} {{browseButton}} für {{duration}} wechsle zu {{scenes}} mit {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Dieser Tab ermöglicht es basierend auf der Videoausgabe von Quellen scenen zu wechseln.<br/>Für eine noch bessere Implementierung dieser Funktionalität siehe <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a>.<br/><br/>Klicke auf das markierte Plus Symbol, um einen neuen Eintrag hinzuzufügen..</p></body></html>"

+; Network Tab
+AdvSceneSwitcher.networkTab.title="Netzwerk"
+AdvSceneSwitcher.networkTab.description="Über diesen Tab kann die aktive Szene einer anderen OBS-Instanz ferngesteuert werden.\nBitte beachten, dass die Szenennamen auf allen OBS-Instanzen exakt übereinstimmen müssen."
+AdvSceneSwitcher.networkTab.warning="Die Verwendung des Servers außerhalb eines lokalen Netzwerks kann dazu führen, dass die aktive Szene von dritten Personen ausgelesen werden kann."
+AdvSceneSwitcher.networkTab.server="Server starten (Sendet Szenenwechselnachrichten  zu allen verbundenen Clients)"
+AdvSceneSwitcher.networkTab.server.port="Port"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Nur IPv4 verwenden (deaktiviert IPv6)"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Sende Nachrichten für Szenenwechsel"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Sende nur Szenenwechselnachrichten für automatisierte Szenenwechsel"
+AdvSceneSwitcher.networkTab.server.sendPreview="Sende Nachrichten für Vorschau Szenenwechsel im Studio-Modus"
+AdvSceneSwitcher.networkTab.startFailed.message="Der WebSocket-Server konnte nicht gestartet werden, mögliche Gründe:\n - Der TCP-Port %1 wird möglicherweise gerade von einem anderen Programm verwendet. Versuchen Sie einen anderen Port in den Websocket-Servereinstellungen zu setzen oder alle Programme zu beenden, die den Port möglicherweise verwenden.\n - Fehler: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Aktueller Status"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Nicht gestartet"
+AdvSceneSwitcher.networkTab.server.status.starting="Startet"
+AdvSceneSwitcher.networkTab.server.status.running="Server läuft"
+AdvSceneSwitcher.networkTab.server.restart="Server neu starten"
+AdvSceneSwitcher.networkTab.client="Client starten (Empfängt Szenenwechselnachrichten )"
+AdvSceneSwitcher.networkTab.client.address="Hostname oder IP-Adresse"
+AdvSceneSwitcher.networkTab.client.port="Port"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Aktueller status"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Verbindung getrennt"
+AdvSceneSwitcher.networkTab.client.status.connecting="Verbinde"
+AdvSceneSwitcher.networkTab.client.status.connected="Verbunden"
+AdvSceneSwitcher.networkTab.client.reconnect="Erneutes Verbinden erzwingen"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Szenengruppe"
 AdvSceneSwitcher.sceneGroupTab.list="Szenengruppen"
@@ -745,6 +780,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="Szenengruppen- oder Szenenname existiert
 AdvSceneSwitcher.sceneGroupTab.help="Szenengruppen können, genau wie reguläre Szenen, als Ziel eines Szenenwechsler Eintrags ausgewählt werden.\n\nSzenengruppen bestehen aus einer Liste von Szenen.\nDie aktive Szene der Szenengruppe schreitet abhängig von den konfigurierten Einstellungen durch die Liste der zugewiesenen Szenen fort.\n\nMögliche Einstellungen zum Fortschreiten der aktiven Szene sind:\nAnzahl der Szenenwechsel.\nZeit seit dem letzten Szenenwechsel in der Szenengruppe.\nOder zufällig.\n\nSo kann zum Beispiel eine Szenengruppe welche die folgenden Szenen enthält ...\nSzene 1\nSzene 2\nSzene 3 \n... beim erstem Mal zu \"Szene 1\" wechseln.\nBeim zweiten Mal zu \"Szene 2\".\nDie restlichem Male wechselt die Szenengruppe zu \"Szene 3\".\n\nKlicke auf das markierte Plus Symbol, um eine neuen Szenengruppe hinzuzufügen."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Wähle die Szenengruppe, die du bearbeiten möchtest, auf der linken Seite aus.\n\nWähle oben eine Szene aus, die du zur Szenengruppe hinzufügen möchtest, und klicke das Plus Symbol.\n\nDie gleiche Szene kann mehrfach in derselben Szenengruppe auftauchen."

+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Szenen Trigger"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--Trigger auswählen--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="aktiv ist"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="nicht aktiv ist"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="verlassen wird"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--Aktion auswählen--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="Aufnahme starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="Aufnahme pausieren"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="Aufnahme fortsetzen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="Aufnahme stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="Streamen stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="Streamen starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="Replay Buffer starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="Replay Buffer stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="Audio Quelle stumm schalten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="Audio Quelle aktiv schalten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="Szenenwechsler starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="Szenenwechsler stoppen"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="Virtuelle Kamera starten"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="Virtuelle Kamera stoppen"
+AdvSceneSwitcher.sceneTriggerTab.entry="Wenn {{scenes}} {{triggers}} {{actions}} {{audioSources}} nach {{duration}} "
+AdvSceneSwitcher.sceneTriggerTab.help="Dieser Tab ermöglicht es automatisiert Handlungen, wie etwa das Stoppen von einer Aufnahme oder des Streamens, bei einem Szenenwechsel auszuführen."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Starte den Erweiterten Szenenwechsler"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Stoppe den Erweiterten Szenenwechsler"
@@ -752,9 +811,9 @@ AdvSceneSwitcher.hotkey.startStopToggleSwitcherHotkey="Starte/Stoppe den Erweite
 AdvSceneSwitcher.hotkey.macro.pause="Pausiere Makro %1"
 AdvSceneSwitcher.hotkey.macro.unpause="Makro %1 nicht mehr pausieren"
 AdvSceneSwitcher.hotkey.macro.togglePause="Pause von Makro %1 togglen"
-AdvSceneSwitcher.hotkey.macro.segment.up="Makro-Segmentauswahl nach oben verschieben"
-AdvSceneSwitcher.hotkey.macro.segment.down="Makro-Segmentauswahl nach unten verschieben"
-AdvSceneSwitcher.hotkey.macro.segment.remove="Ausgewähltes Makro-Segment entfernen"
+AdvSceneSwitcher.hotkey.upMacroSegmentHotkey="Makro-Segmentauswahl nach oben verschieben"
+AdvSceneSwitcher.hotkey.downMacroSegmentHotkey="Makro-Segmentauswahl nach unten verschieben"
+AdvSceneSwitcher.hotkey.removeMacroSegmentHotkey="Ausgewähltes Makro-Segment entfernen"

 AdvSceneSwitcher.askBackup="Neue Version des Erweiterten Automatischen Szenenwechslers wurde erkannt.\nSoll ein Backup der alten Einstellungen angelegt werden?"
 AdvSceneSwitcher.askForMacro="Makro auswählen {{macroSelection}}"
@@ -841,7 +900,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Dies scheint das erste
 AdvSceneSwitcher.deprecatedTabWarning="Die Entwicklung für dieses Tab wurde gestoppt!\nBitte stattdessen zur Verwendung des Makros-Tab übergehen.\nDieser Hinweis kann im Allgemein-Tab deaktiviert werden."

 AdvSceneSwitcher.unit.milliseconds="Millisekunden"
-AdvSceneSwitcher.unit.seconds="Sekunden"
+AdvSceneSwitcher.unit.secends="Sekunden"
 AdvSceneSwitcher.unit.minutes="Minuten"
 AdvSceneSwitcher.unit.hours="Stunden"
 AdvSceneSwitcher.duration.condition.none="Kein Dauer-Modifikator"
--- a/data/locale/en-US.ini
+++ b/data/locale/en-US.ini
--- a/data/locale/es-ES.ini
+++ b/data/locale/es-ES.ini
@@ -19,12 +19,13 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Emitiendo"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Grabando o emitiendo"
 AdvSceneSwitcher.generalTab.status.checkInterval="Comprobar las condiciones de cambio cada"
 AdvSceneSwitcher.generalTab.generalBehavior="Comportamiento general"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Si no se cumple ninguna condición por"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Solo será tan preciso como el intervalo de comprobación configurado."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="No cambiar"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Cambiar a una escena aleatoria"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Cambiar a:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Si no se cumple ninguna condición por"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Solo será tan preciso como el intervalo de comprobación configurado."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="No cambiar"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Cambiar a una escena aleatoria"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Cambiar a:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="¡Durante este tiempo, se ignorarán las posibles coincidencias!"
+AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Habilitar el registro detallado"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Guardar la posición y el tamaño de la ventana"
 AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Mostrar notificaciones del sistema"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Deshabilitar sugerencias de interfaz de usuario"
@@ -38,7 +39,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exportar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exportar los ajustes para Advanced Scene Switcher ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Importar los ajustes para Advanced Scene Switcher ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Archivos de texto (*.txt *.json)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Archivos de texto (*.txt)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="La importacion la configuracion de escenas fallo"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Configuración de escenas importada correctamente"
 AdvSceneSwitcher.generalTab.priority.fileContent="Contenido del archivo"
@@ -116,6 +117,8 @@ AdvSceneSwitcher.condition.scene.type.changed="Escena cambiada"
 AdvSceneSwitcher.condition.scene.type.notChanged="La escena no ha cambiado"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Durante la transición, verifique la escena de destino de la transición"
 AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="Durante la transición, verifique la escena de origen de la transición"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="Ventana"
 AdvSceneSwitcher.condition.file="Archivo"
 AdvSceneSwitcher.condition.file.entry.line1="Contenido de{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
@@ -125,7 +128,7 @@ AdvSceneSwitcher.condition.media="Medios"
 AdvSceneSwitcher.condition.media.anyOnScene="Cualquier fuente multimedia activada"
 AdvSceneSwitcher.condition.media.allOnScene="Todas las fuentes de medios activadas"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="Desafortunadamente, no todos los tipos de fuentes de medios se comportan de la misma manera (p. ej., fuente de medios frente a estado \"Detenido\" de fuente de video VLC).\n¡Así que experimente lo que funciona para su configuración!"
-AdvSceneSwitcher.condition.media.layout.legacy="El estado de{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}es{{states}}y{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="El estado de{{sourceTypes}}{{mediaSources}}{{scenes}}es{{states}}y{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="coincide exactamente"
 AdvSceneSwitcher.condition.video.condition.differ="no coincide"
@@ -154,12 +157,12 @@ AdvSceneSwitcher.condition.video.patternMatchSuccess="El patrón está resaltado
 AdvSceneSwitcher.condition.video.objectMatchFail="¡No se encontró el objeto!"
 AdvSceneSwitcher.condition.video.objectMatchSuccess="El objeto está resaltado en rojo"
 AdvSceneSwitcher.condition.video.modelLoadFail="¡No se pudieron cargar los datos del modelo!"
-AdvSceneSwitcher.condition.video.layout="{{videoInputTypes}}{{sources}}{{scenes}}{{condition}}{{imagePath}}"
-AdvSceneSwitcher.condition.video.layout.modelPath="Datos del modelo (haar cascade classifier): {{modelDataPath}}"
-AdvSceneSwitcher.condition.video.layout.minNeighbor="Mínimo de vecinos: {{minNeighbors}}"
-AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Reduzca la carga de la CPU realizando una comprobación solo cada {{throttleCount}} milisegundos"
-AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Realizar comprobación solo en el área"
-AdvSceneSwitcher.condition.video.layout.checkArea="{{checkAreaEnable}}Realizar comprobación solo en el área {{checkArea}} {{selectArea}}"
+AdvSceneSwitcher.condition.video.entry="{{videoInputTypes}}{{sources}}{{scenes}}{{condition}}{{imagePath}}"
+AdvSceneSwitcher.condition.video.entry.modelPath="Datos del modelo (haar cascade classifier): {{modelDataPath}}"
+AdvSceneSwitcher.condition.video.entry.minNeighbor="Mínimo de vecinos: {{minNeighbors}}"
+AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}Reduzca la carga de la CPU realizando una comprobación solo cada {{throttleCount}} milisegundos"
+AdvSceneSwitcher.condition.video.entry.checkAreaEnable="Realizar comprobación solo en el área"
+AdvSceneSwitcher.condition.video.entry.checkArea="{{checkAreaEnable}}Realizar comprobación solo en el área {{checkArea}} {{selectArea}}"
 AdvSceneSwitcher.condition.video.minSize="Tamaño mínimo:"
 AdvSceneSwitcher.condition.video.maxSize="Tamaño máximo:"
 AdvSceneSwitcher.condition.video.selectArea="Seleccionar área"
@@ -171,6 +174,7 @@ AdvSceneSwitcher.condition.stream.state.start="Transmisión en ejecución"
 AdvSceneSwitcher.condition.stream.state.stop="Transmisión detenida"
 AdvSceneSwitcher.condition.stream.state.starting="Inicio de transmisión"
 AdvSceneSwitcher.condition.stream.state.stopping="Detener transmisión"
+AdvSceneSwitcher.condition.stream.entry="{{streamState}}{{keyFrameInterval}}"
 AdvSceneSwitcher.condition.record="Grabación"
 AdvSceneSwitcher.condition.record.state.start="Grabación en ejecución"
 AdvSceneSwitcher.condition.record.state.pause="Grabación en pausa"
@@ -265,7 +269,10 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="Próxima coincidencia en: %
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}} Al repetir actualizar la fecha seleccionada para repetir la fecha"
 AdvSceneSwitcher.condition.sceneTransform="Transformar elemento de escena"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtener transformación"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="coincide con la transformación"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="En{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="coincide con la transformación"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="Transición"
 AdvSceneSwitcher.condition.transition.type.current="El tipo de transición actual es"
 AdvSceneSwitcher.condition.transition.type.duration="La duración de la transición actual es"
@@ -341,6 +348,7 @@ AdvSceneSwitcher.action.replay.saveWarn="Advertencia: ¡Guardar con demasiada fr
 AdvSceneSwitcher.action.replay.type.stop="Detener el búfer de reproducción"
 AdvSceneSwitcher.action.replay.type.start="Iniciar búfer de reproducción"
 AdvSceneSwitcher.action.replay.type.save="Guardar búfer de reproducción"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Transmisión"
 AdvSceneSwitcher.action.streaming.type.stop="Detener transmisión"
 AdvSceneSwitcher.action.streaming.type.start="Iniciar transmisión"
@@ -378,6 +386,7 @@ AdvSceneSwitcher.action.macro.type.unpause="Reanudar"
 AdvSceneSwitcher.action.macro.type.resetCounter="Reiniciar contador"
 AdvSceneSwitcher.action.macro.type.run="Ejecutar"
 AdvSceneSwitcher.action.macro.type.stop="Detener"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Estado del complemento"
 AdvSceneSwitcher.action.pluginState.type.stop="Detener el complemento Advanced Scene Switcher"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Cambiar el comportamiento de no coincidencia:"
@@ -405,10 +414,10 @@ AdvSceneSwitcher.action.sceneOrder.type.moveDown="Mover hacia abajo"
 AdvSceneSwitcher.action.sceneOrder.type.moveTop="Mover al principio"
 AdvSceneSwitcher.action.sceneOrder.type.moveBottom="Mover al final"
 AdvSceneSwitcher.action.sceneOrder.type.movePosition="Mover a la posición"
-AdvSceneSwitcher.action.sceneOrder.entry="En{{scenes}}{{actions}}{{sources}}{{sources2}}{{position}}"
+AdvSceneSwitcher.action.sceneOrder.entry="En{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Transformar elemento de escena"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Obtener transformación"
-AdvSceneSwitcher.action.sceneTransform.entry="En{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="En{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Archivo"
 AdvSceneSwitcher.action.file.type.write="Escribir"
 AdvSceneSwitcher.action.file.type.append="Agregar"
@@ -437,6 +446,7 @@ AdvSceneSwitcher.action.random="Aleatorio"
 AdvSceneSwitcher.action.random.entry="Ejecute aleatoriamente cualquiera de las siguientes macros (las macros en pausa se ignoran)"
 AdvSceneSwitcher.action.systray="Notificación de la bandeja del sistema"
 AdvSceneSwitcher.action.screenshot="Captura de pantalla"
+AdvSceneSwitcher.action.screenshot.mainOutput="Salida principal de OBS"
 AdvSceneSwitcher.action.profile="Perfil"
 AdvSceneSwitcher.action.profile.entry="Cambiar perfil activo a {{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="Colección de escenas"
@@ -613,6 +623,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="a menos que la fuente esté inac
 AdvSceneSwitcher.videoTab.entry="Cuando {{videoSources}} {{condition}} {{filePath}} {{browseButton}} durante {{duration}} cambiar a {{scenes}} usando {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Esta pestaña te permitirá cambiar escenas según la salida de vídeo actual de las fuentes seleccionadas.<br/>Asegúrate de revisar <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> para una implementación aún mejor de esta funcionalidad.<br/><br/> Haz clic en el símbolo más resaltado para continuar.</p></body></html>"

+; Network Tab
+AdvSceneSwitcher.networkTab.title="Red"
+AdvSceneSwitcher.networkTab.description="Esta pestaña le permitirá controlar de forma remota la escena activa de otra instancia de OBS.\nTenga en cuenta que los nombres de las escenas deben coincidir exactamente en todas las instancias de OBS".
+AdvSceneSwitcher.networkTab.warning="Ejecutar el servidor fuera de una red local permitirá que terceros lean la escena activa".
+AdvSceneSwitcher.networkTab.server="Iniciar servidor (envía mensajes de cambio de escena a todos los clientes conectados)"
+AdvSceneSwitcher.networkTab.server.port="Puerto"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Bloquear servidor para usar solo IPv4"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Enviar mensajes para cambios de escena"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Solo enviar mensajes para cambios de escena automatizados"
+AdvSceneSwitcher.networkTab.server.sendPreview="Enviar mensajes para obtener una vista previa del cambio de escena cuando se ejecuta en Modo Estudio"
+AdvSceneSwitcher.networkTab.startFailed.message="El servidor WebSockets no pudo iniciarse, tal vez porque:\n - El puerto TCP %1 puede estar actualmente en uso en otro lugar de este sistema, posiblemente por otra aplicación. Intente configurar un puerto TCP diferente en el WebSocket configuración del servidor o detenga cualquier aplicación que pueda estar usando este puerto.\n - Mensaje de error: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Estado actual"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Desconectado"
+AdvSceneSwitcher.networkTab.server.status.starting="Iniciando"
+AdvSceneSwitcher.networkTab.server.status.running="En ejecución"
+AdvSceneSwitcher.networkTab.server.restart="Reiniciar servidor"
+AdvSceneSwitcher.networkTab.client="Iniciar cliente (Recibe mensajes de cambios de escena)"
+AdvSceneSwitcher.networkTab.client.address="Nombre de host o dirección IP"
+AdvSceneSwitcher.networkTab.client.port="Puerto"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Estado actual"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Desconectado"
+AdvSceneSwitcher.networkTab.client.status.connecting="Conectando"
+AdvSceneSwitcher.networkTab.client.status.connected="Conectado"
+AdvSceneSwitcher.networkTab.client.reconnect="Forzar reconexión"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Grupo de escenas"
 AdvSceneSwitcher.sceneGroupTab.list="Grupos de escenas"
@@ -633,6 +668,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="El grupo de escenas o el nombre de la esc
 AdvSceneSwitcher.sceneGroupTab.help="Los grupos de escenas se pueden seleccionar como un objetivo al igual que una escena normal.\n\nComo sugiere el nombre, un grupo de escenas es una colección de varias escenas.\nEl grupo de escenas avanzará a través de la lista de sus escenas asignadas según los ajustes configurados, que se puede encontrar en el lado derecho.\n\nPuedes configurar el grupo de escenas para avanzar a la siguiente escena en la lista:\nDespués de varias veces, el grupo de escenas se selecciona como objetivo.\nDespués de que un cierto período de tiempo haya pasado.\nO al azar.\n\nPor ejemplo, un grupo de escenas que contiene las escenas ... \nEscena 1 \nEscena 2 \nEscena 3 \n ... activará la \"Escena 1 \" la primera vez que se seleccione como objetivo. \nLa segunda vez se activará \"Escena 2 \". \nLas veces restantes \"Escena 3 \" se activarán. \n\nHaz clic en el símbolo más resaltado a continuación para agregar un nuevo grupo de escenas."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Selecciona el grupo de escenas que deseas modificar a la izquierda. \n\nSelecciona una escena para agregar a este grupo de escenas seleccionando la escena de arriba y haciendo clic en el símbolo más a continuación. \n\nSe puede agregar una escena varias veces al mismo grupo de escenas."

+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Activadores de escena"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--selecciona el activador--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="esté activo"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="no esté activo"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="cambie a otra escena"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--Selecciona la acción--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="empezar a grabar"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="pausar la grabación"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="reanudar grabación"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="detener grabación"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="detener transmisión"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="iniciar transmisión"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="iniciar búfer de repetición"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="detener búfer de repetición"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="silenciar fuente"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="dejar de silenciar fuente"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="iniciar el selector de escenas"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="detener el selector de escenas"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="Iniciar Camara Virtual"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="Detener Camara Virtual"
+AdvSceneSwitcher.sceneTriggerTab.entry="Cuando {{scenes}} {{triggers}} {{actions}} {{audioSources}} después de {{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Esta pestaña te permite activar acciones sobre cambios de escena, como detener la grabación o la transmisión."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Iniciar Advanced Scene Switcher"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Detener Advanced Scene Switcher"
@@ -640,9 +699,9 @@ AdvSceneSwitcher.hotkey.startStopToggleSwitcherHotkey="Alternar inicio / detenci
 AdvSceneSwitcher.hotkey.macro.pause="Pausar macro %1"
 AdvSceneSwitcher.hotkey.macro.unpause="Despausar macro %1"
 AdvSceneSwitcher.hotkey.macro.togglePause="Alternar pausa de macro %1"
-AdvSceneSwitcher.hotkey.macro.segment.up="Mover selección de segmento de macro hacia arriba"
-AdvSceneSwitcher.hotkey.macro.segment.down="Mover selección de segmento de macro hacia abajo"
-AdvSceneSwitcher.hotkey.macro.segment.remove="Eliminar segmento de macro seleccionado"
+AdvSceneSwitcher.hotkey.upMacroSegmentHotkey="Mover selección de segmento de macro hacia arriba"
+AdvSceneSwitcher.hotkey.downMacroSegmentHotkey="Mover selección de segmento de macro hacia abajo"
+AdvSceneSwitcher.hotkey.removeMacroSegmentHotkey="Eliminar segmento de macro seleccionado"

 AdvSceneSwitcher.askBackup="Se detectó una nueva versión de Advanced Scene Switcher.\n¿Crear una copia de seguridad de la configuración anterior?"
 AdvSceneSwitcher.askForMacro="Select macro {{macroSelection}}"
@@ -686,7 +745,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Esta parece ser la prim
 AdvSceneSwitcher.deprecatedTabWarning="¡Se detuvo el desarrollo de esta pestaña!\nConsidere cambiar a macros en su lugar.\nEsta sugerencia se puede desactivar en la pestaña General".

 AdvSceneSwitcher.unit.milliseconds="milisegundos"
-AdvSceneSwitcher.unit.seconds="segundos"
+AdvSceneSwitcher.unit.secends="segundos"
 AdvSceneSwitcher.unit.minutes="minutos"
 AdvSceneSwitcher.unit.hours="horas"
 AdvSceneSwitcher.duration.condition.none="Sin límite de tiempo"
--- a/data/locale/fr-FR.ini
+++ b/data/locale/fr-FR.ini
@@ -19,13 +19,14 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Diffusion en continu"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Enregistrement ou Diffusion en continu"
 AdvSceneSwitcher.generalTab.status.checkInterval="Vérifier les conditions toutes les"
 AdvSceneSwitcher.generalTab.generalBehavior="Comportement général"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Si aucune action n'est effectuée pendant"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Sera aussi précis que l'intervalle de vérification configuré."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Ne pas basculer"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Basculer vers n'importe quelle scène dans l'onglet Aléatoire"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Basculer vers :"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Si aucune action n'est effectuée pendant"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Sera aussi précis que l'intervalle de vérification configuré."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Ne pas basculer"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Basculer vers n'importe quelle scène dans l'onglet Aléatoire"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Basculer vers :"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="Après avoir effectué des actions, sauter l'exécution d'actions pendant"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="Pendant cette période, les correspondances potentielles seront ignorées !"
+AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Activer les journaux détaillés"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Enregistrer la position et la taille de la fenêtre"
 AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Afficher les notifications dans la zone de notification système"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Désactiver les indications de l'interface utilisateur"
@@ -43,7 +44,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Exporter"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Importer"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Exporter les paramètres d'Advanced Scene Switcher vers un fichier ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Importer les paramètres d'Advanced Scene Switcher depuis un fichier ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Fichiers texte (*.txt *.json)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Fichiers texte (*.txt)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="L'importation des paramètres d'Advanced Scene Switcher a échoué"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Les paramètres d'Advanced Scene Switcher ont été importés avec succès"
 AdvSceneSwitcher.generalTab.priority.fileContent="Contenu du fichier"
@@ -108,7 +109,7 @@ AdvSceneSwitcher.macroTab.highlightExecutedMacros="Mettre en surbrillance les ma
 AdvSceneSwitcher.macroTab.highlightTrueConditions="Mettre en surbrillance les conditions de la macro actuellement sélectionnée qui ont évalué à vrai récemment"
 AdvSceneSwitcher.macroTab.highlightPerformedActions="Mettre en surbrillance les actions récemment effectuées de la macro actuellement sélectionnée"
 AdvSceneSwitcher.macroTab.newMacroRegisterHotkey="Enregistrer des raccourcis clavier pour contrôler l'état de pause des nouvelles macros"
-AdvSceneSwitcher.macroTab.currentRegisterHotkeys="Enregistrer des raccourcis clavier pour contrôler l'état de pause de la macro sélectionnée"
+AdvSceneSwitcher.macroTab.currentDisableHotkeys="Enregistrer des raccourcis clavier pour contrôler l'état de pause de la macro sélectionnée"
 AdvSceneSwitcher.macroTab.currentSkipExecutionOnStartup="Ignorer l'exécution des actions de la macro actuelle au démarrage"
 AdvSceneSwitcher.macroTab.currentRegisterDock="Enregistrer le widget du dock pour contrôler l'état de pause de la macro sélectionnée ou l'exécuter manuellement"
 AdvSceneSwitcher.macroTab.currentDockAddRunButton="Ajouter un bouton pour exécuter la macro"
@@ -195,7 +196,7 @@ AdvSceneSwitcher.condition.media.source="Source"
 AdvSceneSwitcher.condition.media.anyOnScene="Toute source média sur la scène"
 AdvSceneSwitcher.condition.media.allOnScene="Toutes les sources média sur la scène"
 AdvSceneSwitcher.condition.media.inconsistencyInfo="Malheureusement, toutes les sources média ne se comportent pas de la même manière (par exemple, l'état \"Arrêté\" de la source Media par rapport à la source Vidéo VLC).\nPar conséquent, veuillez expérimenter ce qui fonctionne le mieux pour votre configuration !"
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}l'état est{{states}}et{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}}l'état est{{states}}et{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Vidéo"
 AdvSceneSwitcher.condition.video.condition.match="correspond exactement à"
 AdvSceneSwitcher.condition.video.condition.differ="ne correspond pas à"
@@ -257,14 +258,14 @@ AdvSceneSwitcher.condition.video.colorDeviationThresholdDescription="À quel poi
 AdvSceneSwitcher.condition.video.type.main="Sortie principale d'OBS"
 AdvSceneSwitcher.condition.video.type.source="Source"
 AdvSceneSwitcher.condition.video.type.scene="Scène"
-AdvSceneSwitcher.condition.video.layout.modelPath="Données du modèle (classificateur de cascade de Haar) :{{modelDataPath}}"
-AdvSceneSwitcher.condition.video.layout.minNeighbor="Nombre minimum de voisins :{{minNeighbors}}"
-AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}}Réduire la charge CPU en effectuant la vérification uniquement toutes les{{throttleCount}}millisecondes"
-AdvSceneSwitcher.condition.video.layout.checkAreaEnable="Effectuer la vérification uniquement dans la zone"
-AdvSceneSwitcher.condition.video.layout.ocrColorPick="Vérifier la couleur du texte :{{textColor}}{{selectColor}}"
-AdvSceneSwitcher.condition.video.layout.ocrTextType="Vérifier le type de texte :{{textType}}"
-AdvSceneSwitcher.condition.video.layout.ocrLanguage="Vérifier la langue :{{languageCode}}"
-AdvSceneSwitcher.condition.video.layout.color="Vérifier la couleur :{{color}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.entry.modelPath="Données du modèle (classificateur de cascade de Haar) :{{modelDataPath}}"
+AdvSceneSwitcher.condition.video.entry.minNeighbor="Nombre minimum de voisins :{{minNeighbors}}"
+AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}}Réduire la charge CPU en effectuant la vérification uniquement toutes les{{throttleCount}}millisecondes"
+AdvSceneSwitcher.condition.video.entry.checkAreaEnable="Effectuer la vérification uniquement dans la zone"
+AdvSceneSwitcher.condition.video.entry.orcColorPick="Vérifier la couleur du texte :{{textColor}}{{selectColor}}"
+AdvSceneSwitcher.condition.video.entry.orcTextType="Vérifier le type de texte :{{textType}}"
+AdvSceneSwitcher.condition.video.entry.orcLanguage="Vérifier la langue :{{languageCode}}"
+AdvSceneSwitcher.condition.video.entry.color="Vérifier la couleur :{{color}}{{selectColor}}"
 AdvSceneSwitcher.condition.video.minSize="Taille minimale :"
 AdvSceneSwitcher.condition.video.maxSize="Taille maximale :"
 AdvSceneSwitcher.condition.video.selectArea="Sélectionner la zone"
@@ -381,7 +382,8 @@ AdvSceneSwitcher.condition.date.entry.nextMatchDate="Prochaine correspondance à
 AdvSceneSwitcher.condition.date.entry.updateOnRepeat="{{updateOnRepeat}}À la répétition, mettre à jour la date sélectionnée pour la date de répétition"
 AdvSceneSwitcher.condition.sceneTransform="Transformation de l'élément de la scène"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Obtenir la transformation"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="correspond à la transformation"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="Sur{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="correspond à la transformation"
 AdvSceneSwitcher.condition.transition="Transition"
 AdvSceneSwitcher.condition.transition.type.current="Le type de transition actuel est"
 AdvSceneSwitcher.condition.transition.type.duration="La durée de la transition actuelle est"
@@ -444,7 +446,6 @@ AdvSceneSwitcher.condition.run="Exécution"
 AdvSceneSwitcher.condition.run.entry="Le processus se termine avant le délai de{{timeout}}secondes"
 AdvSceneSwitcher.condition.run.entry.exit="{{checkExitCode}}Vérifier le code de sortie{{exitCode}}
 AdvSceneSwitcher.condition.midi="MIDI"
-AdvSceneSwitcher.condition.midi.entry="Message reçu depuis{{device}}qui correspond à :"
 AdvSceneSwitcher.condition.midi.entry.listen="Définir la sélection des messages MIDI pour les messages entrants sur l'appareil sélectionné :{{listenButton}}"
 AdvSceneSwitcher.condition.display="Affichage"
 AdvSceneSwitcher.condition.display.type.displayName="Le nom des écrans connectés correspond à"
@@ -453,7 +454,7 @@ AdvSceneSwitcher.condition.slideshow="Diaporama"
 AdvSceneSwitcher.condition.slideshow.condition.slideChanged="Diapositive changée"
 AdvSceneSwitcher.condition.slideshow.condition.slideIndex="Le numéro de la diapositive actuelle est"
 AdvSceneSwitcher.condition.slideshow.condition.slidePath="Le chemin de la diapositive actuelle est"
-AdvSceneSwitcher.condition.slideshow.updateInterval.tooltip="Les informations sur l'état du diaporama ne seront mises à jour qu'en fonction du temps configuré entre les diapositives"
+AdvSceneSwitcher.condition.slideshow.updateIntervalTooltip="Les informations sur l'état du diaporama ne seront mises à jour qu'en fonction du temps configuré entre les diapositives"

 ; Macro Actions
 AdvSceneSwitcher.action.scene="Changer de scène"
@@ -596,7 +597,7 @@ AdvSceneSwitcher.action.sceneOrder.type.moveDown="Déplacer vers le bas"
 AdvSceneSwitcher.action.sceneOrder.type.moveTop="Déplacer en haut"
 AdvSceneSwitcher.action.sceneOrder.type.moveBottom="Déplacer en bas"
 AdvSceneSwitcher.action.sceneOrder.type.movePosition="Déplacer à la position"
-AdvSceneSwitcher.action.sceneOrder.entry="Sur{{scenes}}{{actions}}{{sources}}{{sources2}}{{position}}"
+AdvSceneSwitcher.action.sceneOrder.entry="Sur{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Transformation de l'élément de la scène"
 AdvSceneSwitcher.action.sceneTransform.type.manual="Transform"
 AdvSceneSwitcher.action.sceneTransform.type.reset="Réinitialiser la transformation"
@@ -609,7 +610,7 @@ AdvSceneSwitcher.action.sceneTransform.type.centerToScreen="Centrer à l'écran"
 AdvSceneSwitcher.action.sceneTransform.type.centerVertically="Centrer verticalement"
 AdvSceneSwitcher.action.sceneTransform.type.centerHorizontally="Centrer horizontalement"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Obtenir la transformation"
-AdvSceneSwitcher.action.sceneTransform.entry="Sur{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="Sur{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Fichier"
 AdvSceneSwitcher.action.file.type.write="Écrire"
 AdvSceneSwitcher.action.file.type.append="Ajouter"
@@ -646,8 +647,9 @@ AdvSceneSwitcher.action.screenshot.save.default="Par défaut"
 AdvSceneSwitcher.action.screenshot.save.custom="Personnalisé"
 AdvSceneSwitcher.action.screenshot.type.source="Source"
 AdvSceneSwitcher.action.screenshot.type.scene="Scène"
+AdvSceneSwitcher.action.screenshot.mainOutput="Sortie principale d'OBS"
 AdvSceneSwitcher.action.screenshot.blackscreenNote="Les sources ou les scènes qui ne sont pas toujours rendues peuvent entraîner des parties de captures d'écran vides."
-AdvSceneSwitcher.action.screenshot.entry="Capturer{{targetType}}{{sources}}{{scenes}}et enregistrer à l'emplacement{{saveType}}{{variables}}"
+AdvSceneSwitcher.action.screenshot.entry="Capturer{{targetType}}{{sources}}{{scenes}}et enregistrer à l'emplacement{{saveType}}"
 AdvSceneSwitcher.action.profile="Profil"
 AdvSceneSwitcher.action.profile.entry="Changer le profil actif vers{{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="Collection de scènes"
@@ -703,10 +705,10 @@ AdvSceneSwitcher.action.variable.invalidSelection="Sélection invalide !"
 AdvSceneSwitcher.action.variable.actionNoVariableSupport="La récupération de valeurs de variables à partir d'actions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.conditionNoVariableSupport="La récupération de valeurs de variables à partir de conditions %1 n'est pas prise en charge !"
 AdvSceneSwitcher.action.variable.currentSegmentValue="Valeur actuelle :"
-AdvSceneSwitcher.action.variable.layout.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}"
-AdvSceneSwitcher.action.variable.layout.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière :"
-AdvSceneSwitcher.action.variable.layout.userInput.customPrompt="{{useCustomPrompt}}Utiliser un message personnalisé{{inputPrompt}}"
-AdvSceneSwitcher.action.variable.layout.userInput.placeholder="{{useInputPlaceholder}}Remplir avec un indicateur de position{{inputPlaceholder}}"
+AdvSceneSwitcher.action.variable.entry.substringIndex="Début de la sous-chaîne :{{subStringStart}}Taille de la sous-chaîne :{{subStringSize}}"
+AdvSceneSwitcher.action.variable.entry.substringRegex="Attribuer la valeur du match{{regexMatchIdx}}en utilisant une expression régulière :"
+AdvSceneSwitcher.action.variable.entry.userInput.customPrompt="{{useCustomPrompt}}Utiliser un message personnalisé{{inputPrompt}}"
+AdvSceneSwitcher.action.variable.entry.userInput.placeholder="{{useInputPlaceholder}}Remplir avec un indicateur de position{{inputPlaceholder}}"
 AdvSceneSwitcher.action.projector="Projecteur"
 AdvSceneSwitcher.action.projector.type.source="Source"
 AdvSceneSwitcher.action.projector.type.scene="Scène"
@@ -716,6 +718,8 @@ AdvSceneSwitcher.action.projector.type.multiview="Multivue"
 AdvSceneSwitcher.action.projector.display="Affichage"
 AdvSceneSwitcher.action.projector.windowed="Fenêtré"
 AdvSceneSwitcher.action.projector.fullscreen="Plein écran"
+AdvSceneSwitcher.action.projector.entry="Ouvrir le projecteur{{windowTypes}}de{{types}}{{scenes}}{{sources}}"
+AdvSceneSwitcher.action.projector.entry.monitor="sur{{monitors}}"
 AdvSceneSwitcher.action.midi="MIDI"
 AdvSceneSwitcher.action.midi.entry="Envoyer un message à{{device}}:"
 AdvSceneSwitcher.action.midi.entry.listen="Définir la sélection de messages MIDI sur les messages entrants de{{listenDevices}}:{{listenButton}}"
@@ -893,6 +897,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="sauf si la source est inactive"
 AdvSceneSwitcher.videoTab.entry="Lorsque{{videoSources}}{{condition}}{{filePath}}{{browseButton}}pendant{{duration}}, passez à{{scenes}}en utilisant{{transitions}}{{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Cet onglet vous permettra de basculer entre les scènes en fonction de la sortie vidéo actuelle des sources sélectionnées.<br/>Assurez-vous de consulter <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> pour une implémentation encore meilleure de cette fonctionnalité.<br/><br/> Cliquez sur le symbole plus en surbrillance pour continuer.</p></body></html>"

+; Network Tab
+AdvSceneSwitcher.networkTab.title="Réseau"
+AdvSceneSwitcher.networkTab.description="Cet onglet vous permettra de contrôler à distance la scène active d'une autre instance OBS.\nVeuillez noter que les noms de scènes doivent correspondre exactement sur toutes les instances OBS."
+AdvSceneSwitcher.networkTab.warning="Exécuter le serveur en dehors d'un réseau local permettra à des tiers de lire la scène active."
+AdvSceneSwitcher.networkTab.server="Démarrer le serveur (Envoie des messages de changement de scène à tous les clients connectés)"
+AdvSceneSwitcher.networkTab.server.port="Port"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Verrouiller le serveur pour n'utiliser que IPv4"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Envoyer des messages pour les changements de scène"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Envoyer uniquement des messages pour les changements de scène automatisés"
+AdvSceneSwitcher.networkTab.server.sendPreview="Envoyer des messages pour le changement de prévisualisation de scène lors de l'exécution en mode Studio"
+AdvSceneSwitcher.networkTab.startFailed.message="Le serveur WebSocket n'a pas pu démarrer, peut-être parce que :\n - Le port TCP %1 est peut-être déjà utilisé ailleurs sur ce système, éventuellement par une autre application. Essayez de définir un port TCP différent dans les paramètres du serveur WebSocket, ou arrêtez toute application qui pourrait utiliser ce port.\n - Message d'erreur : %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="État actuel"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Non démarré"
+AdvSceneSwitcher.networkTab.server.status.starting="Démarrage"
+AdvSceneSwitcher.networkTab.server.status.running="En cours d'exécution"
+AdvSceneSwitcher.networkTab.server.restart="Redémarrer le serveur"
+AdvSceneSwitcher.networkTab.client="Démarrer le client (Reçoit des messages de changement de scène)"
+AdvSceneSwitcher.networkTab.client.address="Nom d'hôte ou adresse IP"
+AdvSceneSwitcher.networkTab.client.port="Port"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="État actuel"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Déconnecté"
+AdvSceneSwitcher.networkTab.client.status.connecting="Connexion"
+AdvSceneSwitcher.networkTab.client.status.connected="Connecté"
+AdvSceneSwitcher.networkTab.client.reconnect="Forcer la reconnexion"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Groupe de Scènes"
 AdvSceneSwitcher.sceneGroupTab.list="Groupes de Scènes"
@@ -913,6 +942,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="Le nom du Groupe de Scènes ou de la Scè
 AdvSceneSwitcher.sceneGroupTab.help="Les Groupes de Scènes peuvent être sélectionnés comme une cible, tout comme une scène régulière.\n\nComme son nom l'indique, un Groupe de Scènes est une collection de plusieurs scènes.\nLe Groupe de Scènes avancera dans la liste de ses scènes attribuées en fonction des paramètres configurés, que vous pouvez trouver à droite.\n\nVous pouvez configurer le Groupe de Scènes pour passer à la scène suivante dans la liste :\nAprès un certain nombre de fois où le Groupe de Scènes est sélectionné comme cible.\nAprès qu'un certain laps de temps se soit écoulé.\nOu au hasard.\n\nPar exemple, un Groupe de Scènes contenant les scènes...\nScène 1\nScène 2\nScène 3\n... activera "Scène 1" la première fois qu'il est sélectionné comme cible.\nLa deuxième fois, il activera "Scène 2".\nLes fois suivantes, "Scène 3" sera activée.\n\nCliquez sur le symbole plus en surbrillance ci-dessous pour ajouter un nouveau Groupe de Scènes."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Sélectionnez le groupe de scènes que vous souhaitez modifier à gauche.\n\nSélectionnez une scène à ajouter à ce groupe de scènes en sélectionnant la scène ci-dessus et en cliquant sur le symbole plus ci-dessous.\n\nUne scène peut être ajoutée plusieurs fois au même groupe de scènes."

+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Déclencheurs de Scène"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--sélectionnez un déclencheur--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="est active"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="n'est pas active"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="passé à autre chose"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--sélectionnez une action--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="démarrer l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="mettre en pause l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="reprendre l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="arrêter l'enregistrement"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="arrêter la diffusion"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="démarrer la diffusion"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="démarrer le tampon de répétition"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="arrêter le tampon de répétition"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="mettre la source en sourdine"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="annuler la mise en sourdine de la source"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="démarrer le commutateur de scènes avancé"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="arrêter le commutateur de scènes avancé"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="démarrer la caméra virtuelle"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="arrêter la caméra virtuelle"
+AdvSceneSwitcher.sceneTriggerTab.entry="Lorsque{{scenes}}{{triggers}}{{actions}}{{audioSources}}après{{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Cet onglet vous permet de déclencher des actions lors des changements de scènes, comme l'arrêt de l'enregistrement ou de la diffusion."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Démarrer le commutateur de scènes avancé"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Arrêter le commutateur de scènes avancé"
@@ -920,9 +973,9 @@ AdvSceneSwitcher.hotkey.startStopToggleSwitcherHotkey="Basculer le démarrage/ar
 AdvSceneSwitcher.hotkey.macro.pause="Mettre en pause la macro %1"
 AdvSceneSwitcher.hotkey.macro.unpause="Reprendre la macro %1"
 AdvSceneSwitcher.hotkey.macro.togglePause="Basculer la pause de la macro %1"
-AdvSceneSwitcher.hotkey.macro.segment.up="Déplacer la sélection du segment de macro vers le haut"
-AdvSceneSwitcher.hotkey.macro.segment.down="Déplacer la sélection du segment de macro vers le bas"
-AdvSceneSwitcher.hotkey.macro.segment.remove="Supprimer le segment de macro sélectionné"
+AdvSceneSwitcher.hotkey.upMacroSegmentHotkey="Déplacer la sélection du segment de macro vers le haut"
+AdvSceneSwitcher.hotkey.downMacroSegmentHotkey="Déplacer la sélection du segment de macro vers le bas"
+AdvSceneSwitcher.hotkey.removeMacroSegmentHotkey="Supprimer le segment de macro sélectionné"

 AdvSceneSwitcher.askBackup="Une nouvelle version du commutateur de scènes avancé a été détectée.\nSouhaitez-vous créer une sauvegarde des anciens paramètres ?"
 AdvSceneSwitcher.askForMacro="Sélectionnez la macro{{macroSelection}}"
@@ -1108,8 +1161,8 @@ AdvSceneSwitcher.sceneItemSelection.type.sourceName="Nom de la source"
 AdvSceneSwitcher.sceneItemSelection.type.sourceVariable="Nom de la variable"
 AdvSceneSwitcher.sceneItemSelection.type.sourceNamePattern="Le nom de la source correspond au motif"
 AdvSceneSwitcher.sceneItemSelection.type.sourceNamePattern.entry="{{nameConflictIndex}}correspondant à{{pattern}}{{regex}}"
-AdvSceneSwitcher.sceneItemSelection.type.sourceType="Sources de type"
-AdvSceneSwitcher.sceneItemSelection.type.sourceType.entry="{{nameConflictIndex}}Type de source{{sourceTypes}}"
+AdvSceneSwitcher.sceneItemSelection.type.sourceGroup="Sources de type"
+AdvSceneSwitcher.sceneItemSelection.type.sourceGroup.entry="{{nameConflictIndex}}Type de source{{sourceGroups}}"
 AdvSceneSwitcher.sceneItemSelection.type.index="Source avec index"
 AdvSceneSwitcher.sceneItemSelection.type.index.entry="{{index}}source"
 AdvSceneSwitcher.sceneItemSelection.type.indexRange="Sources dans la plage d'index"
@@ -1129,7 +1182,7 @@ AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Il semble que ce soit l
 AdvSceneSwitcher.deprecatedTabWarning="Le développement de cet onglet est terminé !\nVeuillez envisager de passer à l'utilisation des Macros à la place.\nCette astuce peut être désactivée dans l'onglet Général."

 AdvSceneSwitcher.unit.milliseconds="millisecondes"
-AdvSceneSwitcher.unit.seconds="secondes"
+AdvSceneSwitcher.unit.secends="secondes"
 AdvSceneSwitcher.unit.minutes="minutes"
 AdvSceneSwitcher.unit.hours="heures"
 AdvSceneSwitcher.duration.condition.none="Aucun modificateur de durée"
--- a/data/locale/ja-JP.ini
+++ b/data/locale/ja-JP.ini
--- a/data/locale/pt-BR.ini
+++ b/data/locale/pt-BR.ini
--- a/data/locale/ru-RU.ini
+++ b/data/locale/ru-RU.ini
@@ -19,12 +19,13 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Вещание"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Запись или потоковое вещание"
 AdvSceneSwitcher.generalTab.status.checkInterval="Проверять условия переключения каждый раз"
 AdvSceneSwitcher.generalTab.generalBehavior="Общее поведение"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="Если не выполняется условие переключения для"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Будет только настолько точным, насколько настроен интервал проверки."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Не переключаться"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Переключиться на любую сцену на вкладке Random"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Переключиться на:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="Если не выполняется условие переключения для"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Будет только настолько точным, насколько настроен интервал проверки."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Не переключаться"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Переключиться на любую сцену на вкладке Random"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Переключиться на:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="В течение этого времени потенциальные совпадения будут игнорироваться!"
+AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Включить ведение подробного журнала"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Сохранять положение и размер окна"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="Отключить подсказки пользовательского интерфейса"
 AdvSceneSwitcher.generalTab.priority="Приоритет"
@@ -36,7 +37,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Экспорт"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="Импорт"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Экспортировать настройки расширенного переключателя сцен в файл ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Импортировать настройки Advanced Scene Switcher из файла ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Текстовые файлы (*.txt *.json)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Текстовые файлы (*.txt)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Advanced Scene Switcher не удалось импортировать настройки"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Настройки Advanced Scene Switcher импортированы успешно"
 AdvSceneSwitcher.generalTab.priority.fileContent="Содержание файла"
@@ -136,6 +137,7 @@ AdvSceneSwitcher.action.replay="Буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.stop="Остановить буфер воспроизведения"
 AdvSceneSwitcher.action.replay.type.start="Начать воспроизведение буфера"
 AdvSceneSwitcher.action.replay.type.save="Сохранить буфер воспроизведения"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.stop="Остановить потоковое вещание"
 AdvSceneSwitcher.action.streaming.type.start="Начать потоковое вещание"
@@ -306,6 +308,28 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="если источник неа
 AdvSceneSwitcher.videoTab.entry="Когда {{videoSources}} {{condition}} {{filePath}} {{browseButton}} для {{duration}} переключиться на {{scenes}} используя {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Эта вкладка позволит вам переключать сцены на основе текущего видеовыхода выбранных источников.<br/>Обязательно проверьте <a href=\"https://obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> для еще лучшей реализации этой функциональности.<br/><br/> Нажмите на выделенный символ плюса, чтобы продолжить.</p></body></html>"

+; Network Tab
+AdvSceneSwitcher.networkTab.title="Сеть"
+AdvSceneSwitcher.networkTab.warning="Запуск сервера вне локальной сети позволит третьим лицам читать активную сцену."
+AdvSceneSwitcher.networkTab.server="Запустить сервер (отправляет сообщения о переключении сцены всем подключенным клиентам)"
+AdvSceneSwitcher.networkTab.server.port="Порт"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Заблокировать сервер на использование только IPv4"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Отправлять сообщения только для автоматических переключателей сцен"
+AdvSceneSwitcher.networkTab.startFailed.message="Сервер WebSockets не удалось запустить, возможно потому, что:\n - TCP порт %1 может в настоящее время использоваться в другом месте в этой системе, возможно, другим приложением. Попробуйте установить другой TCP порт в настройках сервера WebSocket, или остановите любое приложение, которое может использовать этот порт.\n - Сообщение об ошибке: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Текущий статус"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Не запущен"
+AdvSceneSwitcher.networkTab.server.status.starting="Запуск"
+AdvSceneSwitcher.networkTab.server.status.running="Работает"
+AdvSceneSwitcher.networkTab.server.restart="Перезапустить сервер"
+AdvSceneSwitcher.networkTab.client="Запустить клиент (Получает сообщения о переключении сцен)"
+AdvSceneSwitcher.networkTab.client.address="Имя хоста или IP-адрес"
+AdvSceneSwitcher.networkTab.client.port="Порт"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Текущий статус"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Отключено"
+AdvSceneSwitcher.networkTab.client.status.connecting="Подключение"
+AdvSceneSwitcher.networkTab.client.status.connected="Подключено"
+AdvSceneSwitcher.networkTab.client.reconnect="Принудительное переподключение"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Группа сцен"
 AdvSceneSwitcher.sceneGroupTab.list="Группы сцен"
@@ -326,6 +350,28 @@ AdvSceneSwitcher.sceneGroupTab.exists="Группа сцен или назван
 AdvSceneSwitcher.sceneGroupTab.help="Группы сцен могут быть выбраны в качестве цели так же, как и обычные сцены.\n\nКак следует из названия, группа сцен представляет собой набор из нескольких сцен.\nГруппа сцен будет продвигаться по списку назначенных ей сцен в зависимости от настроенных параметров, которые можно найти справа.\n\nВы можете настроить группу сцен на переход к следующей сцене в списке:\nПосле определенного количества раз, когда группа сцен выбрана в качестве цели.\nПо истечении определенного времени.\nИли случайным образом.\n\nНапример, группа сцен, содержащая сцены ...\nScene 1\nScene 2\nScene 3 \n... активирует \"Scene 1\" в первый раз, когда он выбран в качестве цели.\nВо второй раз он активируется \"Scene 2\".\nОставшееся время \"Scene 3\" будет активирован.\n\nНажмите на выделенный символ плюса ниже, чтобы добавить новую группу сцен."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Выберите группу сцен, которую вы хотите изменить слева.\n\nВыберите сцену для добавления в эту группу сцен, выбрав сцену выше и нажав на символ плюса ниже.\n\nСцена может быть добавлена несколько раз в одну и ту же группу сцен."

+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Триггеры сцены"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--выбрать триггер--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="активен"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="не активен"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="переключился с"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--выбрать действие--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="начать запись"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="приостановить запись"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="отменить паузу записи"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="остановить запись"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="остановить потоковое вещание"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="начать потоковое вещание"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="запустить буфер воспроизведения"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="остановить буфер воспроизведения"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="отключить источник"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="включить источник"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="запустить переключатель сцены"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="остановить переключатель сцены"
+AdvSceneSwitcher.sceneTriggerTab.entry="Когда {{scenes}} {{triggers}} {{actions}} {{audioSources}} после {{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Эта вкладка позволяет запускать действия при изменении сцены, например, остановку записи или потоковой передачи."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Запустить Advanced Scene Switcher"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="становить Advanced Scene Switcher"
@@ -354,6 +400,6 @@ AdvSceneSwitcher.status.active="Активный"
 AdvSceneSwitcher.status.inactive="Неактивен"

 AdvSceneSwitcher.unit.milliseconds="миллисекунды"
-AdvSceneSwitcher.unit.seconds="секунды"
+AdvSceneSwitcher.unit.secends="секунды"
 AdvSceneSwitcher.unit.minutes="минуты"
 AdvSceneSwitcher.unit.hours="часы"
--- a/data/locale/tr-TR.ini
+++ b/data/locale/tr-TR.ini
@@ -19,13 +19,14 @@ AdvSceneSwitcher.generalTab.status.autoStart.streaming="Yayın"
 AdvSceneSwitcher.generalTab.status.autoStart.recordingAndStreaming="Kayıt veya Yayın"
 AdvSceneSwitcher.generalTab.status.checkInterval="Anahtar koşullarını her seferinde kontrol edin"
 AdvSceneSwitcher.generalTab.generalBehavior="Genel davranış"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch="...için herhangi bir işlem yapılmazsa"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip="Yalnızca yapılandırılmış kontrol aralığı kadar doğru olacaktır."
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.dontSwitch="Geçiş Yapma"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchToRandom="Rastgele sekmesinde herhangi bir sahneye geçin"
-AdvSceneSwitcher.generalTab.generalBehavior.onNoMatch.switchTo="Değiştirmek:"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet="...için herhangi bir işlem yapılmazsa"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip="Yalnızca yapılandırılmış kontrol aralığı kadar doğru olacaktır."
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.dontSwitch="Geçiş Yapma"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchToRandom="Rastgele sekmesinde herhangi bir sahneye geçin"
+AdvSceneSwitcher.generalTab.generalBehavior.onNoMet.switchTo="Değiştirmek:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldown="Bir eşleşmeden sonra aşağıdakiler için işlem yapmayın:"
 AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint="Bu süre zarfında olası eşleşmeler göz ardı edilecektir!"
+AdvSceneSwitcher.generalTab.generalBehavior.verboseLogging="Ayrıntılı günlük kaydını etkinleştir"
 AdvSceneSwitcher.generalTab.generalBehavior.saveWindowGeo="Pencere konumunu ve boyutunu kaydet"
 AdvSceneSwitcher.generalTab.generalBehavior.showTrayNotifications="Sistem tepsisi bildirimlerini göster"
 AdvSceneSwitcher.generalTab.generalBehavior.disableUIHints="UI ipuçlarını devre dışı bırak"
@@ -38,7 +39,7 @@ AdvSceneSwitcher.generalTab.saveOrLoadsettings.export="Dışa Aktar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.import="İçe Aktar"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.exportWindowTitle="Gelişmiş Sahne Değiştirici ayarlarını dosyaya aktar ..."
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.importWindowTitle="Gelişmiş Sahne Değiştirici ayarlarını dosyadan içe aktar ..."
-AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text dosyası (*.txt *.json)"
+AdvSceneSwitcher.generalTab.saveOrLoadsettings.textType="Text dosyası (*.txt)"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadFail="Gelişmiş Sahne Değiştirici ayarları dosyadan içe aktarmakta başarısız oldu"
 AdvSceneSwitcher.generalTab.saveOrLoadsettings.loadSuccess="Gelişmiş Sahne Değiştirici ayarları başarılı bir şekilde dosyadan içe aktarıldı"
 AdvSceneSwitcher.generalTab.priority.fileContent="Dosya İçeriği"
@@ -106,6 +107,8 @@ AdvSceneSwitcher.condition.scene.type.previous="Önceki Sahne"
 AdvSceneSwitcher.condition.scene.type.changed="Sahne değişti"
 AdvSceneSwitcher.condition.scene.type.notChanged="Sahne değişmedi"
 AdvSceneSwitcher.condition.scene.currentSceneTransitionBehaviour="Geçiş hedefi sahnesi için geçiş kontrolü sırasında"
+AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}"
+AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}"
 AdvSceneSwitcher.condition.window="Pencere"
 AdvSceneSwitcher.condition.file="Dosya"
 AdvSceneSwitcher.condition.file.entry.line1="İçerik{{fileType}}{{filePath}}{{conditions}}{{useRegex}}"
@@ -114,7 +117,7 @@ AdvSceneSwitcher.condition.file.entry.line3="{{checkModificationDate}}{{checkFil
 AdvSceneSwitcher.condition.media="Medya"
 AdvSceneSwitcher.condition.media.anyOnScene="Herhangi bir medya kaynağı"
 AdvSceneSwitcher.condition.media.allOnScene="Tüm medya kaynakları "
-AdvSceneSwitcher.condition.media.layout.legacy="{{sourceTypes}}{{mediaSources}}{{scenes}}{{checkTypes}}durumu{{states}}ve{{timeRestrictions}}{{time}}"
+AdvSceneSwitcher.condition.media.entry="{{sourceTypes}}{{mediaSources}}{{scenes}}durumu{{states}}ve{{timeRestrictions}}{{time}}"
 AdvSceneSwitcher.condition.video="Video"
 AdvSceneSwitcher.condition.video.condition.match="Tam olarak eşleşir"
 AdvSceneSwitcher.condition.video.condition.differ="Eşleştirme"
@@ -139,15 +142,16 @@ AdvSceneSwitcher.condition.video.screenshotFail="Kaynağın ekran görüntüsü
 AdvSceneSwitcher.condition.video.patternMatchFail="Desen bulunamadı!"
 AdvSceneSwitcher.condition.video.objectMatchFail="Nesne bulunamadı!"
 AdvSceneSwitcher.condition.video.modelLoadFail="Model verileri yüklenemedi!"
-AdvSceneSwitcher.condition.video.layout="{{videoInputTypes}}{{sources}}{{scenes}}{{condition}}{{imagePath}}"
-AdvSceneSwitcher.condition.video.layout.modelPath="Model verileri (haar kademeli sınıflandırıcı):{{modelDataPath}}"
-AdvSceneSwitcher.condition.video.layout.minNeighbor="Minimum komşular: {{minNeighbors}}"
-AdvSceneSwitcher.condition.video.layout.throttle="{{throttleEnable}} Yalnızca her seferinde kontrol gerçekleştirerek CPU yükünü azaltın {{throttleCount}} millisaniyeler"
+AdvSceneSwitcher.condition.video.entry="{{videoInputTypes}}{{sources}}{{scenes}}{{condition}}{{imagePath}}"
+AdvSceneSwitcher.condition.video.entry.modelPath="Model verileri (haar kademeli sınıflandırıcı):{{modelDataPath}}"
+AdvSceneSwitcher.condition.video.entry.minNeighbor="Minimum komşular: {{minNeighbors}}"
+AdvSceneSwitcher.condition.video.entry.throttle="{{throttleEnable}} Yalnızca her seferinde kontrol gerçekleştirerek CPU yükünü azaltın {{throttleCount}} millisaniyeler"
 AdvSceneSwitcher.condition.stream="Yayınlama"
 AdvSceneSwitcher.condition.stream.state.start="Yayın çalışıyor"
 AdvSceneSwitcher.condition.stream.state.stop="Yayın durdu"
 AdvSceneSwitcher.condition.stream.state.starting="Yayın başlıyor"
 AdvSceneSwitcher.condition.stream.state.stopping="Yayın duruyor"
+AdvSceneSwitcher.condition.stream.entry="{{streamState}}{{keyFrameInterval}}"
 AdvSceneSwitcher.condition.record="Kayıt"
 AdvSceneSwitcher.condition.record.state.start="Kayıt Çalışıyor"
 AdvSceneSwitcher.condition.record.state.pause="Kayıt durakladı"
@@ -222,7 +226,10 @@ AdvSceneSwitcher.condition.date.state.before="Önce"
 AdvSceneSwitcher.condition.date.state.between="Arasında"
 AdvSceneSwitcher.condition.sceneTransform="Sahne öğesi dönüşümü"
 AdvSceneSwitcher.condition.sceneTransform.getTransform="Dönüşümü al"
-AdvSceneSwitcher.condition.sceneTransform.condition.match="dönüşümle eşleşir"
+AdvSceneSwitcher.condition.sceneTransform.entry.line1="Açık{{scenes}}{{sources}}{{types}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.type.matches="dönüşümle eşleşir"
+AdvSceneSwitcher.condition.sceneTransform.entry.line2="{{settings}}"
+AdvSceneSwitcher.condition.sceneTransform.entry.line3="{{regex}} {{getSettings}}"
 AdvSceneSwitcher.condition.transition="Geçiş"
 AdvSceneSwitcher.condition.transition.type.current="Geçerli geçiş türü"
 AdvSceneSwitcher.condition.transition.type.duration="Mevcut geçiş süresi"
@@ -272,6 +279,7 @@ AdvSceneSwitcher.action.replay="Tekrar arabelleği"
 AdvSceneSwitcher.action.replay.type.stop="Tekrar arabelleğini durdur"
 AdvSceneSwitcher.action.replay.type.start="Tekrar arabelleğini başlat"
 AdvSceneSwitcher.action.replay.type.save="Tekrar arabelleğini kaydet"
+AdvSceneSwitcher.action.replay.entry="{{actions}}"
 AdvSceneSwitcher.action.streaming="Yayın"
 AdvSceneSwitcher.action.streaming.type.stop="Yayın durdur"
 AdvSceneSwitcher.action.streaming.type.start="Yayın başlat"
@@ -307,6 +315,7 @@ AdvSceneSwitcher.action.macro.type.pause="Duraklat"
 AdvSceneSwitcher.action.macro.type.unpause="Duraklatma"
 AdvSceneSwitcher.action.macro.type.resetCounter="Sayacı sıfırla"
 AdvSceneSwitcher.action.macro.type.run="Çalıştır"
+AdvSceneSwitcher.action.macro.entry="{{actions}}{{actionIndex}}{{macros}}"
 AdvSceneSwitcher.action.pluginState="Eklenti durumu"
 AdvSceneSwitcher.action.pluginState.type.stop="Advanced Scene Switcher eklentisini durdurun"
 AdvSceneSwitcher.action.pluginState.type.noMatch="Eşleşmeme davranışını değiştirin:"
@@ -334,10 +343,10 @@ AdvSceneSwitcher.action.sceneOrder.type.moveDown="Aşağı indir"
 AdvSceneSwitcher.action.sceneOrder.type.moveTop="En üste taşı"
 AdvSceneSwitcher.action.sceneOrder.type.moveBottom="Aşağıya taşı"
 AdvSceneSwitcher.action.sceneOrder.type.movePosition="Konuma taşı"
-AdvSceneSwitcher.action.sceneOrder.entry="Açık{{scenes}}{{actions}}{{sources}}{{sources2}}{{position}}"
+AdvSceneSwitcher.action.sceneOrder.entry="Açık{{scenes}}{{actions}}{{sources}}{{position}}"
 AdvSceneSwitcher.action.sceneTransform="Sahne öğesi dönüşümü"
 AdvSceneSwitcher.action.sceneTransform.getTransform="Dönüşümü al"
-AdvSceneSwitcher.action.sceneTransform.entry="Açık{{scenes}}{{action}}{{rotation}}{{sources}}{{settingSelection}}{{singleSettingValue}}"
+AdvSceneSwitcher.action.sceneTransform.entry="Açık{{scenes}}{{action}}{{rotation}}{{sources}}"
 AdvSceneSwitcher.action.file="Dosya"
 AdvSceneSwitcher.action.file.type.write="Yaz"
 AdvSceneSwitcher.action.file.type.append="Ekle"
@@ -355,6 +364,7 @@ AdvSceneSwitcher.action.random="Rastgele"
 AdvSceneSwitcher.action.random.entry="Aşağıdaki makrolardan herhangi birini rastgele çalıştırın (duraklatılmış makrolar yoksayılır)"
 AdvSceneSwitcher.action.systray="Sistem tepsisi bildirimi"
 AdvSceneSwitcher.action.screenshot="Ekran görüntüsü"
+AdvSceneSwitcher.action.screenshot.mainOutput="OBS'nin ana çıkışı"
 AdvSceneSwitcher.action.profile="Profil"
 AdvSceneSwitcher.action.profile.entry="Aktif profili şununla değiştir: {{profiles}}"
 AdvSceneSwitcher.action.sceneCollection="Sahne koleksiyonu"
@@ -524,6 +534,31 @@ AdvSceneSwitcher.videoTab.ignoreInactiveSource="Kaynak etkin olmadığı sürece
 AdvSceneSwitcher.videoTab.entry="Zaman {{videoSources}} {{condition}} {{filePath}} {{browseButton}} için {{duration}} şuna dönüştür {{scenes}} kullan {{transitions}} {{ignoreInactiveSource}}"
 AdvSceneSwitcher.videoTab.help="<html><head/><body><p>Bu sekme, seçilen kaynakların mevcut video çıkışına göre sahneler arasında geçiş yapmanızı sağlar.<br/><a href=\"https:// adresini kontrol ettiğinizden emin olun. obsproject.com/forum/resources/pixel-match-switcher.1202/\"><span style=\" text-decoration: underline; color:#268bd2;\">Pixel Match Switcher</span></a> bu işlevin daha da iyi bir şekilde uygulanması için.<br/><br/> Devam etmek için vurgulanan artı simgesini tıklayın.</p></body></html>"

+; Network Tab
+AdvSceneSwitcher.networkTab.title="Ağ"
+AdvSceneSwitcher.networkTab.description="Bu sekme, başka bir OBS örneğinin etkin sahnesini uzaktan kontrol etmenizi sağlar.\nSahne adlarının tüm OBS örneklerinde tam olarak eşleşmesi gerektiğini lütfen unutmayın."
+AdvSceneSwitcher.networkTab.warning="Sunucuyu yerel bir ağın dışında çalıştırmak, üçüncü tarafların aktif sahneyi okumasına izin verecektir."
+AdvSceneSwitcher.networkTab.server="Sunucuyu başlat (Bağlı tüm istemcilere sahne değiştirme mesajları gönderir)"
+AdvSceneSwitcher.networkTab.server.port="Port"
+AdvSceneSwitcher.networkTab.server.lockToIPv4="Sunucuyu yalnızca IPv4 kullanacak şekilde kilitleyin"
+AdvSceneSwitcher.networkTab.server.sendSceneChange="Sahne değişiklikleri için mesaj gönder"
+AdvSceneSwitcher.networkTab.server.restrictSendToAutomatedSwitches="Yalnızca otomatik sahne anahtarları için mesaj gönder"
+AdvSceneSwitcher.networkTab.server.sendPreview="Stüdyo modunda çalışırken önizleme sahnesi değişikliği için mesajlar gönderin"
+AdvSceneSwitcher.networkTab.startFailed.message="WebSockets sunucusu başlatılamadı, bunun nedeni şunlar olabilir:\n - %1 TCP bağlantı noktası şu anda bu sistemde başka bir yerde, muhtemelen başka bir uygulama tarafından kullanılıyor olabilir. WebSocket sunucu ayarlarında farklı bir TCP bağlantı noktası ayarlamayı deneyin veya bu bağlantı noktasını kullanabilecek herhangi bir uygulamayı durdurun.\n - Hata mesajı: %2"
+AdvSceneSwitcher.networkTab.server.status.currentStatus="Şu anki durum"
+AdvSceneSwitcher.networkTab.server.status.notRunning="Çalışmıyor"
+AdvSceneSwitcher.networkTab.server.status.starting="Başlangıç"
+AdvSceneSwitcher.networkTab.server.status.running="Çalışıyor"
+AdvSceneSwitcher.networkTab.server.restart="Sunucuyu yeniden başlat"
+AdvSceneSwitcher.networkTab.client="İstemciyi başlat (Sahne değiştirme mesajlarını alır)"
+AdvSceneSwitcher.networkTab.client.address="Ana makine adı veya IP adresi"
+AdvSceneSwitcher.networkTab.client.port="Port"
+AdvSceneSwitcher.networkTab.client.status.currentStatus="Şu anki durum"
+AdvSceneSwitcher.networkTab.client.status.disconnected="Bağlantı kesildi"
+AdvSceneSwitcher.networkTab.client.status.connecting="Bağlanıyor"
+AdvSceneSwitcher.networkTab.client.status.connected="Bağlandı"
+AdvSceneSwitcher.networkTab.client.reconnect="Yeniden bağlanmaya zorla"
+
 ; Scene Group Tab
 AdvSceneSwitcher.sceneGroupTab.title="Sahne Grubu"
 AdvSceneSwitcher.sceneGroupTab.list="Sahne Grupları"
@@ -544,6 +579,30 @@ AdvSceneSwitcher.sceneGroupTab.exists="Sahne Grubu veya Sahne adı zaten var"
 AdvSceneSwitcher.sceneGroupTab.help="Sahne Grupları, normal bir sahne gibi bir hedef olarak seçilebilir.\n\nAdından da anlaşılacağı gibi, bir sahne grubu birden fazla sahneden oluşan bir koleksiyondur.\nSahne grubu, yapılandırılmış ayarlara bağlı olarak kendisine atanan sahneler listesinde ilerleyecektir. sağ tarafta bulunabilir.\n\nSahne grubunu listedeki bir sonraki sahneye geçecek şekilde yapılandırabilirsiniz:\nSahne grubu birkaç kez hedef olarak seçildikten sonra.\nBelirli bir süre sonra geçti.\nVeya rastgele.\n\nÖrneğin, sahneleri içeren bir sahne grubu ...\nSahne 1\nSahne 2\nSahne 3 \n... ilk seçildiğinde \"Sahne 1\"i etkinleştirecek bir hedef olarak.\nİkinci kez \"Sahne 2\"yi etkinleştirecek.\nKalan zamanlar \"Scene 3\" etkinleştirilecek.\n\nYeni bir sahne grubu eklemek için aşağıdaki vurgulanan artı sembolüne tıklayın."
 AdvSceneSwitcher.sceneGroupTab.scenes.help="Soldan değiştirmek istediğiniz sahne grubunu seçin.\n\nYukarıdaki sahneyi seçip aşağıdaki artı simgesini tıklayarak bu sahne grubuna eklemek için bir sahne seçin.\n\nAynı sahneye birden fazla sahne eklenebilir grup."

+; Scene Trigger Tab
+AdvSceneSwitcher.sceneTriggerTab.title="Sahne Tetikleyicileri"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none="--tetikleyiciyi seçin--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive="aktif"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive="aktif değil"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave="uzaklaştı"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none="--eylemi seç--"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording="Kayda başla"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording="Kaydı duraklat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording="kaydı duraklatma"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording="Kaydetmeyi bırak"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming="Akışı durdur"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming="Akışı başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer="Yeniden oynatma arabelleğini başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer="Tekrar arabelleğini durdur"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource="Kaynağı sessize al"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource="Kaynağı sesi aç"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher="Sahne değiştiriciyi başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher="Sahne değiştiriciyi durdur"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera="Sanal kamerayı başlat"
+AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera="Sanal kamerayı durdur"
+AdvSceneSwitcher.sceneTriggerTab.entry="Şundan {{scenes}} {{triggers}} {{actions}} {{audioSources}} sonra {{duration}}"
+AdvSceneSwitcher.sceneTriggerTab.help="Bu sekme, kaydı veya akışı durdurma gibi sahne değişikliklerinde eylemleri tetiklemenize olanak tanır."
+
 ; Hotkey
 AdvSceneSwitcher.hotkey.startSwitcherHotkey="Advanced Scene Switcher'ı başlatın"
 AdvSceneSwitcher.hotkey.stopSwitcherHotkey="Gelişmiş Sahne Değiştiriciyi Durdurun"
@@ -591,7 +650,7 @@ AdvSceneSwitcher.stopped="Eklenti durdu"
 AdvSceneSwitcher.firstBootMessage="<html><head/><body><p>Gelişmiş Sahne Değiştirici ilk kez başlatılıyor gibi görünüyor.<br>Lütfen <a href=\"https://github.com/ adresine bir göz atın. WarmUpTill/SceneSwitcher/wiki\"><span style=\" text-decoration: underline; color:#268bd2;\">Wiki</span></a> için kılavuzlar ve örnekler listesi.<br>Yapmayın. eklentinin <a href=\"https://obsproject.com/forum/threads/advanced-scene-switcher.48264\"><span style=\" text-decoration: underline; color:# sayfasında soru sormaktan çekinmeyin OBS forumlarında 268bd2;\">konu</span></a>!</p></body></html>"

 AdvSceneSwitcher.unit.milliseconds="millisaniye"
-AdvSceneSwitcher.unit.seconds="saniye"
+AdvSceneSwitcher.unit.secends="saniye"
 AdvSceneSwitcher.unit.minutes="dakika"
 AdvSceneSwitcher.unit.hours="saat"
 AdvSceneSwitcher.duration.condition.none="Zaman kısıtlaması yok"
--- a/data/locale/zh-CN.ini
+++ b/data/locale/zh-CN.ini
--- a/data/res/images/logo.ico
+++ b/data/res/images/logo.ico
--- a/deps/date
+++ b/deps/date
--- a/deps/exprtk/exprtk.hpp
+++ b/deps/exprtk/exprtk.hpp
--- a/deps/jsoncons
+++ b/deps/jsoncons
--- a/deps/libremidi
+++ b/deps/libremidi
--- a/deps/libusb
+++ b/deps/libusb
--- a/deps/obs-websocket/lib/obs-websocket-api.h
+++ b/deps/obs-websocket/lib/obs-websocket-api.h
@@ -22,17 +22,14 @@ with this program. If not, see <https://www.gnu.org/licenses/>

 #include <obs.h>

-#define OBS_WEBSOCKET_API_VERSION 3
+#define OBS_WEBSOCKET_API_VERSION 2

 #ifdef __cplusplus
 extern "C" {
 #endif

 typedef void *obs_websocket_vendor;
-typedef void (*obs_websocket_request_callback_function)(obs_data_t *,
-							obs_data_t *, void *);
-typedef void (*obs_websocket_event_callback_function)(uint64_t, const char *,
-						      const char *, void *);
+typedef void (*obs_websocket_request_callback_function)(obs_data_t *, obs_data_t *, void *);

 struct obs_websocket_request_response {
 	unsigned int status_code;
@@ -47,12 +44,7 @@ struct obs_websocket_request_callback {
 	void *priv_data;
 };

-struct obs_websocket_event_callback {
-	obs_websocket_event_callback_function callback;
-	void *priv_data;
-};
-
-static proc_handler_t *_ph;
+inline proc_handler_t *_ph;

 /* ==================== INTERNAL API FUNCTIONS ==================== */

@@ -61,10 +53,9 @@ static inline proc_handler_t *obs_websocket_get_ph(void)
 	proc_handler_t *global_ph = obs_get_proc_handler();
 	assert(global_ph != NULL);

-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
 	if (!proc_handler_call(global_ph, "obs_websocket_api_get_ph", &cd))
-		blog(LOG_DEBUG,
-		     "Unable to fetch obs-websocket proc handler object. obs-websocket not installed?");
+		blog(LOG_DEBUG, "Unable to fetch obs-websocket proc handler object. obs-websocket not installed?");
 	proc_handler_t *ret = (proc_handler_t *)calldata_ptr(&cd, "ph");
 	calldata_free(&cd);

@@ -78,9 +69,7 @@ static inline bool obs_websocket_ensure_ph(void)
 	return _ph != NULL;
 }

-static inline bool
-obs_websocket_vendor_run_simple_proc(obs_websocket_vendor vendor,
-				     const char *proc_name, calldata_t *cd)
+static inline bool obs_websocket_vendor_run_simple_proc(obs_websocket_vendor vendor, const char *proc_name, calldata_t *cd)
 {
 	if (!obs_websocket_ensure_ph())
 		return false;
@@ -102,12 +91,12 @@ static inline unsigned int obs_websocket_get_api_version(void)
 	if (!obs_websocket_ensure_ph())
 		return 0;

-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};

 	if (!proc_handler_call(_ph, "get_api_version", &cd))
 		return 1; // API v1 does not include get_api_version

-	unsigned int ret = (unsigned int)calldata_int(&cd, "version");
+	unsigned int ret = calldata_int(&cd, "version");

 	calldata_free(&cd);

@@ -115,12 +104,7 @@ static inline unsigned int obs_websocket_get_api_version(void)
 }

 // Calls an obs-websocket request. Free response with `obs_websocket_request_response_free()`
-static inline struct obs_websocket_request_response *
-obs_websocket_call_request(const char *request_type, obs_data_t *request_data
-#ifdef __cplusplus
-						     = NULL
-#endif
-)
+static inline obs_websocket_request_response *obs_websocket_call_request(const char *request_type, obs_data_t *request_data = NULL)
 {
 	if (!obs_websocket_ensure_ph())
 		return NULL;
@@ -129,15 +113,14 @@ obs_websocket_call_request(const char *request_type, obs_data_t *request_data
 	if (request_data)
 		request_data_string = obs_data_get_json(request_data);

-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
+
 	calldata_set_string(&cd, "request_type", request_type);
 	calldata_set_string(&cd, "request_data", request_data_string);

 	proc_handler_call(_ph, "call_request", &cd);

-	struct obs_websocket_request_response *ret =
-		(struct obs_websocket_request_response *)calldata_ptr(
-			&cd, "response");
+	auto ret = (struct obs_websocket_request_response *)calldata_ptr(&cd, "response");

 	calldata_free(&cd);

@@ -145,8 +128,7 @@ obs_websocket_call_request(const char *request_type, obs_data_t *request_data
 }

 // Free a request response object returned by `obs_websocket_call_request()`
-static inline void obs_websocket_request_response_free(
-	struct obs_websocket_request_response *response)
+static inline void obs_websocket_request_response_free(struct obs_websocket_request_response *response)
 {
 	if (!response)
 		return;
@@ -158,59 +140,17 @@ static inline void obs_websocket_request_response_free(
 	bfree(response);
 }

-// Register an event handler to receive obs-websocket events
-static inline bool obs_websocket_register_event_callback(
-	obs_websocket_event_callback_function event_callback, void *priv_data)
-{
-	if (!obs_websocket_ensure_ph())
-		return false;
-
-	struct obs_websocket_event_callback cb = {event_callback, priv_data};
-
-	calldata_t cd = {0, 0, 0, 0};
-	calldata_set_ptr(&cd, "callback", &cb);
-
-	proc_handler_call(_ph, "register_event_callback", &cd);
-
-	bool ret = calldata_bool(&cd, "success");
-
-	calldata_free(&cd);
-
-	return ret;
-}
-
-// Unregister an existing event handler
-static inline bool obs_websocket_unregister_event_callback(
-	obs_websocket_event_callback_function event_callback, void *priv_data)
-{
-	if (!obs_websocket_ensure_ph())
-		return false;
-
-	struct obs_websocket_event_callback cb = {event_callback, priv_data};
-
-	calldata_t cd = {0, 0, 0, 0};
-	calldata_set_ptr(&cd, "callback", &cb);
-
-	proc_handler_call(_ph, "unregister_event_callback", &cd);
-
-	bool ret = calldata_bool(&cd, "success");
-
-	calldata_free(&cd);
-
-	return ret;
-}
-
 /* ==================== VENDOR API FUNCTIONS ==================== */

 // ALWAYS CALL ONLY VIA `obs_module_post_load()` CALLBACK!
 // Registers a new "vendor" (Example: obs-ndi)
-static inline obs_websocket_vendor
-obs_websocket_register_vendor(const char *vendor_name)
+static inline obs_websocket_vendor obs_websocket_register_vendor(const char *vendor_name)
 {
 	if (!obs_websocket_ensure_ph())
 		return NULL;

-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
+
 	calldata_set_string(&cd, "name", vendor_name);

 	proc_handler_call(_ph, "vendor_register", &cd);
@@ -221,35 +161,32 @@ obs_websocket_register_vendor(const char *vendor_name)
 }

 // Registers a new request for a vendor
-static inline bool obs_websocket_vendor_register_request(
-	obs_websocket_vendor vendor, const char *request_type,
-	obs_websocket_request_callback_function request_callback,
-	void *priv_data)
+static inline bool obs_websocket_vendor_register_request(obs_websocket_vendor vendor, const char *request_type,
+							 obs_websocket_request_callback_function request_callback, void *priv_data)
 {
-	struct obs_websocket_request_callback cb = {request_callback,
-						    priv_data};
+	calldata_t cd = {0};
+
+	struct obs_websocket_request_callback cb = {};
+	cb.callback = request_callback;
+	cb.priv_data = priv_data;

-	calldata_t cd = {0, 0, 0, 0};
 	calldata_set_string(&cd, "type", request_type);
 	calldata_set_ptr(&cd, "callback", &cb);

-	bool success = obs_websocket_vendor_run_simple_proc(
-		vendor, "vendor_request_register", &cd);
+	bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_request_register", &cd);
 	calldata_free(&cd);

 	return success;
 }

 // Unregisters an existing vendor request
-static inline bool
-obs_websocket_vendor_unregister_request(obs_websocket_vendor vendor,
-					const char *request_type)
+static inline bool obs_websocket_vendor_unregister_request(obs_websocket_vendor vendor, const char *request_type)
 {
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
+
 	calldata_set_string(&cd, "type", request_type);

-	bool success = obs_websocket_vendor_run_simple_proc(
-		vendor, "vendor_request_unregister", &cd);
+	bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_request_unregister", &cd);
 	calldata_free(&cd);

 	return success;
@@ -257,16 +194,14 @@ obs_websocket_vendor_unregister_request(obs_websocket_vendor vendor,

 // Does not affect event_data refcount.
 // Emits an event under the vendor's name
-static inline bool obs_websocket_vendor_emit_event(obs_websocket_vendor vendor,
-						   const char *event_name,
-						   obs_data_t *event_data)
+static inline bool obs_websocket_vendor_emit_event(obs_websocket_vendor vendor, const char *event_name, obs_data_t *event_data)
 {
-	calldata_t cd = {0, 0, 0, 0};
+	calldata_t cd = {0};
+
 	calldata_set_string(&cd, "type", event_name);
 	calldata_set_ptr(&cd, "data", (void *)event_data);

-	bool success = obs_websocket_vendor_run_simple_proc(
-		vendor, "vendor_event_emit", &cd);
+	bool success = obs_websocket_vendor_run_simple_proc(vendor, "vendor_event_emit", &cd);
 	calldata_free(&cd);

 	return success;
--- a/deps/opencv
+++ b/deps/opencv
--- a/deps/paho.mqtt.cpp
+++ b/deps/paho.mqtt.cpp
--- a/forms/advanced-scene-switcher.ui
+++ b/forms/advanced-scene-switcher.ui
--- a/lib/advanced-scene-switcher.cpp
+++ b/lib/advanced-scene-switcher.cpp
@@ -1,5 +1,6 @@
 #include "advanced-scene-switcher.hpp"
 #include "backup.hpp"
+#include "curl-helper.hpp"
 #include "log-helper.hpp"
 #include "macro-helpers.hpp"
 #include "obs-module-helper.hpp"
@@ -13,20 +14,15 @@
 #include "tab-helpers.hpp"
 #include "utility.hpp"
 #include "version.h"
-#include "websocket-api.hpp"

+#include <filesystem>
 #include <obs-frontend-api.h>
 #include <QAction>
 #include <QDirIterator>
-#include <QLibrary>
 #include <QMainWindow>
 #include <QTextStream>
 #include <regex>

-#ifdef _WIN32
-#include <Windows.h>
-#endif
-
 namespace advss {

 AdvSceneSwitcher *AdvSceneSwitcher::window = nullptr;
@@ -74,9 +70,6 @@ static void DisplayMissingDependencyWarning()
 	QString warning(obs_module_text(
 		"AdvSceneSwitcher.generalTab.generalBehavior.warnPluginLoadFailureMessage"));
 	DisplayMessage(warning.arg(failedLibsString));
-
-	// Only display the warning once per plugin load
-	switcher->loadFailureLibs.clear();
 }

 static void DisplayMissingDataDirWarning()
@@ -89,32 +82,18 @@ static void DisplayMissingDataDirWarning()
 		      "Please check installation instructions!\n\n"
 		      "Data most likely expected at:\n\n";
 #ifdef _WIN32
-
-	msg += QDir::currentPath();
+	msg += QString::fromStdString(
+		(std::filesystem::current_path().string()));
 	msg += "/";
 #endif
 	msg += obs_get_module_data_path(obs_current_module());
 	DisplayMessage(msg);
 }

-bool CanCreateDefaultAction();
-bool CanCreateDefaultCondition();
-
-static void DisplayCorruptedInstallWarning()
-{
-	if (CanCreateDefaultAction() && CanCreateDefaultCondition()) {
-		return;
-	}
-
-	DisplayMessage(obs_module_text(
-		"AdvSceneSwitcher.generalTab.generalBehavior.warnCorruptedInstallMessage"));
-}
-
 void AdvSceneSwitcher::LoadUI()
 {
 	DisplayMissingDataDirWarning();
 	DisplayMissingDependencyWarning();
-	DisplayCorruptedInstallWarning();

 	SetupGeneralTab();
 	SetupTitleTab();
@@ -130,7 +109,9 @@ void AdvSceneSwitcher::LoadUI()
 	SetupTimeTab();
 	SetupAudioTab();
 	SetupVideoTab();
+	SetupNetworkTab();
 	SetupSceneGroupTab();
+	SetupTriggerTab();
 	SetupMacroTab();
 	SetupOtherTabs(ui->tabWidget);

@@ -257,9 +238,9 @@ void SwitcherData::Thread()
 			duration = std::chrono::milliseconds(interval) +
 				   std::chrono::milliseconds(linger) - runTime;
 			if (duration.count() < 1) {
-				vblog(LOG_INFO,
-				      "detected busy loop - refusing to sleep less than 1ms");
-				duration = std::chrono::milliseconds(10);
+				blog(LOG_INFO,
+				     "detected busy loop - refusing to sleep less than 1ms");
+				duration = std::chrono::milliseconds(50);
 			}
 		}

@@ -311,7 +292,7 @@ void SwitcherData::Thread()
 			}
 		}

-		RunIntervalResetSteps();
+		ResetForNextInterval();

 		if (match) {
 			if (macroMatch) {
@@ -361,6 +342,14 @@ void SwitcherData::SetPreconditions()
 	InvalidateMacroTempVarValues();
 }

+void SwitcherData::ResetForNextInterval()
+{
+	// Plugin reset functions
+	for (const auto &func : resetIntervalSteps) {
+		func();
+	}
+}
+
 bool SwitcherData::CheckForMatch(OBSWeakSource &scene,
 				 OBSWeakSource &transition, int &linger,
 				 bool &setPrevSceneAfterLinger,
@@ -441,7 +430,7 @@ void AutoStartActionQueues();
 void SwitcherData::Start()
 {
 	if (!(th && th->isRunning())) {
-		RunIntervalResetSteps();
+		ResetForNextInterval();
 		ResetMacros();
 		AutoStartActionQueues();

@@ -449,7 +438,17 @@ void SwitcherData::Start()
 		th = new SwitcherThread();
 		th->start((QThread::Priority)threadPriority);

-		RunStartSteps();
+		// Will be overwritten quickly but might be useful
+		writeToStatusFile("Advanced Scene Switcher running");
+	}
+
+	if (networkConfig.ServerEnabled) {
+		server.start(networkConfig.ServerPort,
+			     networkConfig.LockToIPv4);
+	}
+
+	if (networkConfig.ClientEnabled) {
+		client.connect(networkConfig.GetClientUri());
 	}

 	if (showSystemTrayNotifications) {
@@ -476,9 +475,12 @@ void SwitcherData::Stop()
 		th->wait();
 		delete th;
 		th = nullptr;
-		RunStopSteps();
+		writeToStatusFile("Advanced Scene Switcher stopped");
 	}

+	server.stop();
+	client.disconnect();
+
 	if (showSystemTrayNotifications) {
 		DisplayTrayMessage(
 			obs_module_text("AdvSceneSwitcher.pluginName"),
@@ -546,7 +548,12 @@ static void handleSceneChange()
 		      GetWeakSourceName(switcher->previousScene).c_str());
 	}

+	switcher->checkTriggers();
 	switcher->checkDefaultSceneTransitions();
+
+	if (switcher->networkConfig.ShouldSendFrontendSceneChange()) {
+		switcher->server.sendMessage({ws.Get(), nullptr, 0});
+	}
 }

 static void setLiveTime()
@@ -575,6 +582,17 @@ static void checkAutoStartStreaming()
 		switcher->Start();
 }

+static void handlePeviewSceneChange()
+{
+	if (switcher->networkConfig.ShouldSendPrviewSceneChange()) {
+		OBSSourceAutoRelease source =
+			obs_frontend_get_current_preview_scene();
+		OBSWeakSourceAutoRelease weak =
+			obs_source_get_weak_source(source);
+		switcher->server.sendMessage({weak.Get(), nullptr, 0}, true);
+	}
+}
+
 static void handleTransitionEnd()
 {
 	GetMacroTransitionCV().notify_all();
@@ -652,6 +670,9 @@ static void OBSEvent(enum obs_frontend_event event, void *switcher)
 	case OBS_FRONTEND_EVENT_SCENE_CHANGED:
 		handleSceneChange();
 		break;
+	case OBS_FRONTEND_EVENT_PREVIEW_SCENE_CHANGED:
+		handlePeviewSceneChange();
+		break;
 	case OBS_FRONTEND_EVENT_RECORDING_STARTED:
 		setLiveTime();
 		checkAutoStartRecording();
@@ -684,7 +705,7 @@ static void LoadPlugins()
 {
 	QFileInfo libPath(
 		QString(obs_get_module_binary_path(obs_current_module())));
-	QString pluginDir(libPath.absolutePath() + "/" ADVSS_PLUGIN_FOLDER);
+	QString pluginDir(libPath.absolutePath() + "/adv-ss-plugins");
 #ifdef _WIN32
 	QString libPattern = "*.dll";
 	SetDllDirectory(pluginDir.toStdWString().c_str());
@@ -724,34 +745,9 @@ void OpenSettingsWindow()
 	}
 }

-void AdvSceneSwitcher::HighlightMacroSettingsButton(bool enable)
+QWidget *GetSettingsWindow()
 {
-	static QObject *highlight = nullptr;
-	if ((highlight && enable) || (!highlight && !enable)) {
-		return;
-	}
-
-	if (highlight && !enable) {
-		highlight->deleteLater();
-		highlight = nullptr;
-		return;
-	}
-
-	if (!HighlightUIElementsEnabled()) {
-		return;
-	}
-
-	highlight = HighlightWidget(ui->macroSettings, Qt::green);
-}
-
-void HighlightMacroSettingsButton(bool enable)
-{
-	auto window = GetSettingsWindow();
-	if (!window) {
-		return;
-	}
-	static_cast<AdvSceneSwitcher *>(window)->HighlightMacroSettingsButton(
-		enable);
+	return SettingsWindowIsOpened() ? AdvSceneSwitcher::window : nullptr;
 }

 void SetupActionQueues();
--- a/lib/advanced-scene-switcher.hpp
+++ b/lib/advanced-scene-switcher.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "macro-segment-list.hpp"
-#include "condition-logic.hpp"
 #include "log-helper.hpp"

 #include <ui_advanced-scene-switcher.h>
@@ -11,7 +10,6 @@ namespace advss {

 class MacroActionEdit;
 class MacroConditionEdit;
-class MacroSegment;
 class Duration;
 class SequenceWidget;
 struct SceneGroup;
@@ -54,7 +52,6 @@ public slots:
 	void on_noMatchRandomSwitch_clicked();
 	void NoMatchDelayDurationChanged(const Duration &);
 	void CooldownDurationChanged(const Duration &);
-	void on_enableCooldown_stateChanged(int state);
 	void on_startupBehavior_currentIndexChanged(int index);
 	void on_logLevel_currentIndexChanged(int index);
 	void on_autoStartEvent_currentIndexChanged(int index);
@@ -67,7 +64,6 @@ public slots:
 	void on_showTrayNotifications_stateChanged(int state);
 	void on_uiHintsDisable_stateChanged(int state);
 	void on_disableComboBoxFilter_stateChanged(int state);
-	void on_disableMacroWidgetCache_stateChanged(int state);
 	void on_warnPluginLoadFailure_stateChanged(int state);
 	void on_hideLegacyTabs_stateChanged(int state);
 	void on_priorityUp_clicked();
@@ -84,33 +80,30 @@ public:
 	void RemoveMacro(std::shared_ptr<Macro> &);
 	void RemoveSelectedMacros();
 	void RenameMacro(std::shared_ptr<Macro> &, const QString &name);
-	std::shared_ptr<Macro> GetSelectedMacro() const;
-	std::vector<std::shared_ptr<Macro>> GetSelectedMacros() const;
+	std::shared_ptr<Macro> GetSelectedMacro();
+	std::vector<std::shared_ptr<Macro>> GetSelectedMacros();
 	void SetEditMacro(Macro &m);
-	void SetMacroEditAreaDisabled(bool) const;
-	void HighlightAction(int idx, QColor color = QColor(Qt::green)) const;
-	void HighlightElseAction(int idx,
-				 QColor color = QColor(Qt::green)) const;
-	void HighlightCondition(int idx,
-				QColor color = QColor(Qt::green)) const;
+	void SetMacroEditAreaDisabled(bool);
+	void HighlightAction(int idx, QColor color = QColor(Qt::green));
+	void HighlightElseAction(int idx, QColor color = QColor(Qt::green));
+	void HighlightCondition(int idx, QColor color = QColor(Qt::green));
 	void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0);
 	void PopulateMacroElseActions(Macro &m, uint32_t afterIdx = 0);
 	void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0);
-	void SetActionData(Macro &m) const;
-	void SetElseActionData(Macro &m) const;
-	void SetConditionData(Macro &m) const;
+	void SetActionData(Macro &m);
+	void SetElseActionData(Macro &m);
+	void SetConditionData(Macro &m);
 	void SwapActions(Macro *m, int pos1, int pos2);
 	void SwapConditions(Macro *m, int pos1, int pos2);
-	void HighlightMacroSettingsButton(bool enable = true);

 public slots:
 	void on_macroAdd_clicked();
 	void on_macroRemove_clicked();
-	void on_macroUp_clicked() const;
-	void on_macroDown_clicked() const;
+	void on_macroUp_clicked();
+	void on_macroDown_clicked();
 	void on_macroName_editingFinished();
-	void on_runMacroInParallel_stateChanged(int value) const;
-	void on_runMacroOnChange_stateChanged(int value) const;
+	void on_runMacroInParallel_stateChanged(int value);
+	void on_runMacroOnChange_stateChanged(int value);
 	void on_conditionAdd_clicked();
 	void on_conditionRemove_clicked();
 	void on_conditionTop_clicked();
@@ -123,14 +116,14 @@ public slots:
 	void on_actionUp_clicked();
 	void on_actionDown_clicked();
 	void on_actionBottom_clicked();
-	void on_toggleElseActions_clicked() const;
+	void on_toggleElseActions_clicked();
 	void on_elseActionAdd_clicked();
 	void on_elseActionRemove_clicked();
 	void on_elseActionTop_clicked();
 	void on_elseActionUp_clicked();
 	void on_elseActionDown_clicked();
 	void on_elseActionBottom_clicked();
-	void MacroSelectionAboutToChange() const;
+	void MacroSelectionAboutToChange();
 	void MacroSelectionChanged();
 	void UpMacroSegementHotkey();
 	void DownMacroSegementHotkey();
@@ -141,34 +134,30 @@ public slots:
 	void ShowMacroConditionsContextMenu(const QPoint &);
 	void CopyMacro();
 	void RenameSelectedMacro();
-	void ExportMacros() const;
+	void ExportMacros();
 	void ImportMacros();
-	void ExpandAllActions() const;
-	void ExpandAllElseActions() const;
-	void ExpandAllConditions() const;
-	void CollapseAllActions() const;
-	void CollapseAllElseActions() const;
-	void CollapseAllConditions() const;
-	void MinimizeActions() const;
-	void MaximizeActions() const;
-	void MinimizeElseActions() const;
-	void MaximizeElseActions() const;
-	void MinimizeConditions() const;
-	void MaximizeConditions() const;
-	void SetElseActionsStateToHidden() const;
-	void SetElseActionsStateToVisible() const;
+	void ExpandAllActions();
+	void ExpandAllElseActions();
+	void ExpandAllConditions();
+	void CollapseAllActions();
+	void CollapseAllElseActions();
+	void CollapseAllConditions();
+	void MinimizeActions();
+	void MaximizeActions();
+	void MinimizeElseActions();
+	void MaximizeElseActions();
+	void MinimizeConditions();
+	void MaximizeConditions();
+	void SetElseActionsStateToHidden();
+	void SetElseActionsStateToVisible();
 	void MacroActionSelectionChanged(int idx);
 	void MacroActionReorder(int to, int target);
-	void AddMacroAction(Macro *macro, int idx, const std::string &id,
-			    obs_data_t *data);
 	void AddMacroAction(int idx);
 	void RemoveMacroAction(int idx);
 	void MoveMacroActionUp(int idx);
 	void MoveMacroActionDown(int idx);
 	void MacroElseActionSelectionChanged(int idx);
 	void MacroElseActionReorder(int to, int target);
-	void AddMacroElseAction(Macro *macro, int idx, const std::string &id,
-				obs_data_t *data);
 	void AddMacroElseAction(int idx);
 	void RemoveMacroElseAction(int idx);
 	void SwapElseActions(Macro *m, int pos1, int pos2);
@@ -177,24 +166,27 @@ public slots:
 	void MacroConditionSelectionChanged(int idx);
 	void MacroConditionReorder(int to, int target);
 	void AddMacroCondition(int idx);
-	void AddMacroCondition(Macro *macro, int idx, const std::string &id,
-			       obs_data_t *data, Logic::Type logic);
 	void RemoveMacroCondition(int idx);
 	void MoveMacroConditionUp(int idx);
 	void MoveMacroConditionDown(int idx);
-	void HighlightControls() const;
-	void HighlightOnChange() const;
-	void on_macroSettings_clicked();
-	void CopyMacroSegment();
-	void PasteMacroSegment();
+	void FadeOutActionControls();
+	void FadeOutConditionControls();
+	void ResetOpacityActionControls();
+	void ResetOpacityConditionControls();
+	void HighlightControls();
+	void HighlightOnChange();
+	void on_macroProperties_clicked();

 signals:
 	void MacroAdded(const QString &name);
 	void MacroRemoved(const QString &name);
 	void MacroRenamed(const QString &oldName, const QString &newName);
 	void MacroSegmentOrderChanged();
-	void SegmentTempVarsChanged(MacroSegment *);
+	void SegmentTempVarsChanged();
 	void HighlightMacrosChanged(bool value);
+	void HighlightActionsChanged(bool value);
+	void HighlightElseActionsChanged(bool value);
+	void HighlightConditionsChanged(bool value);

 	void ConnectionAdded(const QString &);
 	void ConnectionRenamed(const QString &oldName, const QString &newName);
@@ -363,6 +355,24 @@ public slots:
 	void on_videoDown_clicked();
 	void on_getScreenshot_clicked();

+	// Scene group tab
+public:
+	void SetupNetworkTab();
+public slots:
+	void on_serverSettings_toggled(bool on);
+	void on_serverPort_valueChanged(int value);
+	void on_lockToIPv4_stateChanged(int state);
+	void on_serverRestart_clicked();
+	void UpdateServerStatus();
+	void on_clientSettings_toggled(bool on);
+	void on_clientHostname_textChanged(const QString &text);
+	void on_clientPort_valueChanged(int value);
+	void on_sendSceneChange_stateChanged(int state);
+	void on_restrictSend_stateChanged(int state);
+	void on_sendPreview_stateChanged(int state);
+	void on_clientReconnect_clicked();
+	void UpdateClientStatus();
+
 	// Scene group tab
 public:
 	void SetupSceneGroupTab();
@@ -384,12 +394,19 @@ signals:
 	void SceneGroupRemoved(const QString &name);
 	void SceneGroupRenamed(const QString &oldName, const QString newName);

+	// Trigger tab
+public:
+	void SetupTriggerTab();
+public slots:
+	void on_triggerAdd_clicked();
+	void on_triggerRemove_clicked();
+	void on_triggerUp_clicked();
+	void on_triggerDown_clicked();
+
 	/* --- End of legacy tab section --- */
-private:
-	void SetCheckIntervalTooLowVisibility() const;
 };

 void OpenSettingsWindow();
-void HighlightMacroSettingsButton(bool enable);
+QWidget *GetSettingsWindow();

 } // namespace advss
--- a/lib/general.cpp
+++ b/lib/general.cpp
@@ -91,17 +91,6 @@ void AdvSceneSwitcher::CooldownDurationChanged(const Duration &dur)
 	switcher->cooldown = dur;
 }

-void AdvSceneSwitcher::on_enableCooldown_stateChanged(int state)
-{
-	if (loading) {
-		return;
-	}
-
-	std::lock_guard<std::mutex> lock(switcher->m);
-	switcher->enableCooldown = state;
-	ui->cooldownTime->setEnabled(state);
-}
-
 void AdvSceneSwitcher::on_startupBehavior_currentIndexChanged(int index)
 {
 	if (loading) {
@@ -113,12 +102,12 @@ void AdvSceneSwitcher::on_startupBehavior_currentIndexChanged(int index)
 		static_cast<SwitcherData::StartupBehavior>(index);
 }

-void AdvSceneSwitcher::on_logLevel_currentIndexChanged(int idx)
+void AdvSceneSwitcher::on_logLevel_currentIndexChanged(int value)
 {
 	if (loading) {
 		return;
 	}
-	SetLogLevel(static_cast<LogLevel>(ui->logLevel->itemData(idx).toInt()));
+	switcher->logLevel = static_cast<SwitcherData::LogLevel>(value);
 }

 void AdvSceneSwitcher::on_autoStartEvent_currentIndexChanged(int index)
@@ -150,8 +139,6 @@ void AdvSceneSwitcher::on_checkInterval_valueChanged(int value)

 	std::lock_guard<std::mutex> lock(switcher->m);
 	switcher->interval = value;
-
-	SetCheckIntervalTooLowVisibility();
 }

 void AdvSceneSwitcher::closeEvent(QCloseEvent *)
@@ -205,16 +192,6 @@ void AdvSceneSwitcher::on_disableComboBoxFilter_stateChanged(int state)
 	FilterComboBox::SetFilterBehaviourEnabled(!state);
 }

-void AdvSceneSwitcher::on_disableMacroWidgetCache_stateChanged(int state)
-{
-	if (loading) {
-		return;
-	}
-
-	switcher->disableMacroWidgetCache = state;
-	MacroSegmentList::SetCachingEnabled(!state);
-}
-
 void AdvSceneSwitcher::on_warnPluginLoadFailure_stateChanged(int state)
 {
 	if (loading) {
@@ -228,6 +205,7 @@ static bool isLegacyTab(const QString &name)
 {
 	return name == obs_module_text(
 			       "AdvSceneSwitcher.sceneGroupTab.title") ||
+	       name == obs_module_text("AdvSceneSwitcher.networkTab.title") ||
 	       name == obs_module_text(
 			       "AdvSceneSwitcher.transitionTab.title") ||
 	       name == obs_module_text(
@@ -245,7 +223,9 @@ static bool isLegacyTab(const QString &name)
 			       "AdvSceneSwitcher.sceneSequenceTab.title") ||
 	       name == obs_module_text("AdvSceneSwitcher.audioTab.title") ||
 	       name == obs_module_text("AdvSceneSwitcher.videoTab.title") ||
-	       name == obs_module_text("AdvSceneSwitcher.pauseTab.title");
+	       name == obs_module_text("AdvSceneSwitcher.pauseTab.title") ||
+	       name == obs_module_text(
+			       "AdvSceneSwitcher.sceneTriggerTab.title");
 }

 void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
@@ -257,10 +237,6 @@ void AdvSceneSwitcher::on_hideLegacyTabs_stateChanged(int state)
 			ui->tabWidget->setTabVisible(idx, !state);
 		}
 	}
-
-	// Changing priority of legacy tabs will very likely not be necessary if
-	// the legacy tabs are hidden
-	ui->priorityBox->setVisible(!switcher->hideLegacyTabs);
 }

 void AdvSceneSwitcher::SetDeprecationWarnings()
@@ -285,15 +261,12 @@ static bool containsSensitiveData(obs_data_t *data)
 		obs_data_get_array(data, "twitchConnections");
 	OBSDataArrayAutoRelease websocketConnections =
 		obs_data_get_array(data, "websocketConnections");
-	OBSDataArrayAutoRelease mqttConnections =
-		obs_data_get_array(data, "mqttConnections");

 	auto isNotEmpty = [](obs_data_array *array) {
 		return obs_data_array_count(array) > 0;
 	};

-	return isNotEmpty(twitchTokens) || isNotEmpty(websocketConnections) ||
-	       isNotEmpty(mqttConnections);
+	return isNotEmpty(twitchTokens) || isNotEmpty(websocketConnections);
 }

 void AdvSceneSwitcher::on_exportSettings_clicked()
@@ -357,10 +330,6 @@ void AdvSceneSwitcher::on_importSettings_clicked()
 		return;
 	}

-	// We have to make sure to that no macro is currently being edited while
-	// the new settings are loaded
-	ui->macros->clearSelection();
-
 	std::lock_guard<std::mutex> lock(switcher->m);
 	switcher->LoadSettings(obj);
 	switcher->lastImportPath = path.toStdString();
@@ -396,7 +365,6 @@ void AdvSceneSwitcher::CheckFirstTimeSetup()
 		switcher->firstBoot = false;
 		DisplayMessage(
 			obs_module_text("AdvSceneSwitcher.firstBootMessage"));
-		switcher->Start();
 	}
 }

@@ -463,7 +431,7 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	}

 	LoadMacros(obj);
-	LoadGlobalMacroSettings(obj);
+	LoadGlobalMacroProperties(obj);
 	loadWindowTitleSwitches(obj);
 	loadScreenRegionSwitches(obj);
 	loadPauseSwitches(obj);
@@ -477,6 +445,8 @@ void SwitcherData::LoadSettings(obs_data_t *obj)
 	loadTimeSwitches(obj);
 	loadAudioSwitches(obj);
 	loadVideoSwitches(obj);
+	loadNetworkSettings(obj);
+	loadSceneTriggers(obj);
 	LoadGeneralSettings(obj);
 	LoadHotkeys(obj);
 	LoadUISettings(obj);
@@ -496,7 +466,7 @@ void SwitcherData::SaveSettings(obs_data_t *obj)

 	saveSceneGroups(obj);
 	SaveMacros(obj);
-	SaveGlobalMacroSettings(obj);
+	SaveGlobalMacroProperties(obj);
 	SaveVariables(obj);
 	saveWindowTitleSwitches(obj);
 	saveScreenRegionSwitches(obj);
@@ -511,6 +481,8 @@ void SwitcherData::SaveSettings(obs_data_t *obj)
 	saveTimeSwitches(obj);
 	saveAudioSwitches(obj);
 	saveVideoSwitches(obj);
+	saveNetworkSwitches(obj);
+	saveSceneTriggers(obj);
 	SaveGeneralSettings(obj);
 	SaveHotkeys(obj);
 	SaveUISettings(obj);
@@ -533,7 +505,6 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	noMatchDelay.Save(obj, "noMatchDelay");

 	cooldown.Save(obj, "cooldown");
-	obs_data_set_bool(obj, "enableCooldown", enableCooldown);

 	obs_data_set_bool(obj, "active", sceneColletionStop ? true : !stop);
 	sceneColletionStop = false;
@@ -543,15 +514,12 @@ void SwitcherData::SaveGeneralSettings(obs_data_t *obj)
 	obs_data_set_int(obj, "autoStartEvent",
 			 static_cast<int>(autoStartEvent));

-	SaveLogLevel(obj);
-
+	obs_data_set_int(obj, "logLevel", static_cast<int>(logLevel));
 	obs_data_set_bool(obj, "showSystemTrayNotifications",
 			  showSystemTrayNotifications);
 	obs_data_set_bool(obj, "disableHints", disableHints);
 	obs_data_set_bool(obj, "disableFilterComboboxFilter",
 			  disableFilterComboboxFilter);
-	obs_data_set_bool(obj, "disableMacroWidgetCache",
-			  disableMacroWidgetCache);
 	obs_data_set_bool(obj, "warnPluginLoadFailure", warnPluginLoadFailure);
 	obs_data_set_bool(obj, "hideLegacyTabs", hideLegacyTabs);

@@ -582,11 +550,6 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	noMatchDelay.Load(obj, "noMatchDelay");

 	cooldown.Load(obj, "cooldown");
-	if (!obs_data_has_user_value(obj, "enableCooldown")) {
-		enableCooldown = cooldown.Seconds() != 0;
-	} else {
-		enableCooldown = obs_data_get_bool(obj, "enableCooldown");
-	}

 	obs_data_set_default_bool(obj, "active", true);
 	stop = !obs_data_get_bool(obj, "active");
@@ -602,15 +565,12 @@ void SwitcherData::LoadGeneralSettings(obs_data_t *obj)
 	autoStartEvent =
 		static_cast<AutoStart>(obs_data_get_int(obj, "autoStartEvent"));

-	LoadLogLevel(obj);
-
+	logLevel = static_cast<LogLevel>(obs_data_get_int(obj, "logLevel"));
 	showSystemTrayNotifications =
 		obs_data_get_bool(obj, "showSystemTrayNotifications");
 	disableHints = obs_data_get_bool(obj, "disableHints");
 	disableFilterComboboxFilter =
 		obs_data_get_bool(obj, "disableFilterComboboxFilter");
-	disableMacroWidgetCache =
-		obs_data_get_bool(obj, "disableMacroWidgetCache");
 	obs_data_set_default_bool(obj, "warnPluginLoadFailure", true);
 	warnPluginLoadFailure = obs_data_get_bool(obj, "warnPluginLoadFailure");
 	obs_data_set_default_bool(obj, "hideLegacyTabs", true);
@@ -693,7 +653,7 @@ void SwitcherData::CheckNoMatchSwitch(bool &match, OBSWeakSource &scene,

 void SwitcherData::checkSwitchCooldown(bool &match)
 {
-	if (!match || !enableCooldown) {
+	if (!match) {
 		return;
 	}

@@ -833,28 +793,6 @@ static void setupGeneralTabInactiveWarning(QTabWidget *tabs)
 	inactiveTimer->start();
 }

-void advss::AdvSceneSwitcher::SetCheckIntervalTooLowVisibility() const
-{
-	auto macro = GetMacroWithInvalidConditionInterval();
-	if (!macro) {
-		ui->checkIntervalTooLowWarning->hide();
-		return;
-	}
-
-	const QString labelTextFormat(obs_module_text(
-		"AdvSceneSwitcher.generalTab.status.checkIntervalTooLow"));
-	const QString labelTooltipFormat(obs_module_text(
-		"AdvSceneSwitcher.generalTab.status.checkIntervalTooLow.tooltip"));
-	const QString name = QString::fromStdString(macro->Name());
-	const QString duration = QString::fromStdString(
-		macro->GetCustomConditionCheckInterval().ToString());
-
-	ui->checkIntervalTooLowWarning->setText(labelTextFormat.arg(name));
-	ui->checkIntervalTooLowWarning->setToolTip(
-		labelTooltipFormat.arg(name).arg(duration).arg(name));
-	ui->checkIntervalTooLowWarning->show();
-}
-
 void AdvSceneSwitcher::SetupGeneralTab()
 {
 	PopulateSceneSelection(ui->noMatchSwitchScene, false);
@@ -876,17 +814,14 @@ void AdvSceneSwitcher::SetupGeneralTab()
 	DurationSelection *noMatchDelay = new DurationSelection();
 	noMatchDelay->SetDuration(switcher->noMatchDelay);
 	noMatchDelay->setToolTip(obs_module_text(
-		"AdvSceneSwitcher.generalTab.generalBehavior.onNoMatchDelay.tooltip"));
+		"AdvSceneSwitcher.generalTab.generalBehavior.onNoMetDelayTooltip"));
 	ui->noMatchLayout->addWidget(noMatchDelay);
 	QWidget::connect(noMatchDelay,
 			 SIGNAL(DurationChanged(const Duration &)), this,
 			 SLOT(NoMatchDelayDurationChanged(const Duration &)));

 	ui->checkInterval->setValue(switcher->interval);
-	SetCheckIntervalTooLowVisibility();

-	ui->enableCooldown->setChecked(switcher->enableCooldown);
-	ui->cooldownTime->setEnabled(switcher->enableCooldown);
 	ui->cooldownTime->SetDuration(switcher->cooldown);
 	ui->cooldownTime->setToolTip(obs_module_text(
 		"AdvSceneSwitcher.generalTab.generalBehavior.cooldownHint"));
@@ -894,9 +829,7 @@ void AdvSceneSwitcher::SetupGeneralTab()
 			 SIGNAL(DurationChanged(const Duration &)), this,
 			 SLOT(CooldownDurationChanged(const Duration &)));

-	PopulateLogLevelSelection(ui->logLevel);
-	ui->logLevel->setCurrentIndex(
-		ui->logLevel->findData(static_cast<int>(GetLogLevel())));
+	ui->logLevel->setCurrentIndex(static_cast<int>(switcher->logLevel));

 	ui->saveWindowGeo->setChecked(switcher->saveWindowGeo);
 	ui->showTrayNotifications->setChecked(
@@ -906,9 +839,6 @@ void AdvSceneSwitcher::SetupGeneralTab()
 		switcher->disableFilterComboboxFilter);
 	FilterComboBox::SetFilterBehaviourEnabled(
 		!switcher->disableFilterComboboxFilter);
-	ui->disableMacroWidgetCache->setChecked(
-		switcher->disableMacroWidgetCache);
-	MacroSegmentList::SetCachingEnabled(!switcher->disableMacroWidgetCache);
 	ui->warnPluginLoadFailure->setChecked(switcher->warnPluginLoadFailure);
 	ui->hideLegacyTabs->setChecked(switcher->hideLegacyTabs);

--- a/lib/legacy/scene-group.cpp
+++ b/lib/legacy/scene-group.cpp
@@ -12,7 +12,7 @@

 namespace advss {

-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 SceneGroupEditWidget *typeEdit = nullptr;

 std::deque<SceneGroup> &GetSceneGroups()
@@ -170,10 +170,7 @@ void AdvSceneSwitcher::on_sceneGroupAdd_clicked()
 	item->setData(Qt::UserRole, text);
 	ui->sceneGroups->setCurrentItem(item);

-	if (addPulse) {
-		addPulse->deleteLater();
-		addPulse = nullptr;
-	}
+	ui->sceneGroupAdd->disconnect(addPulse);
 	ui->sceneGroupHelp->setVisible(false);

 	emit SceneGroupAdded(QString::fromStdString(name));
@@ -515,8 +512,8 @@ void AdvSceneSwitcher::SetupSceneGroupTab()

 	if (switcher->sceneGroups.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->sceneGroupAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->sceneGroupAdd,
+					       QColor(Qt::green));
 		}
 		ui->sceneGroupHelp->setVisible(true);
 	} else {
--- a/lib/legacy/scene-trigger.cpp
+++ b/lib/legacy/scene-trigger.cpp
@@ -0,0 +1,581 @@
+#include "advanced-scene-switcher.hpp"
+#include "layout-helpers.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "switcher-data.hpp"
+#include "ui-helpers.hpp"
+#include "utility.hpp"
+
+#include <obs-frontend-api.h>
+#include <thread>
+
+namespace advss {
+
+bool SceneTrigger::pause = false;
+static QMetaObject::Connection addPulse;
+
+void AdvSceneSwitcher::on_triggerAdd_clicked()
+{
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->sceneTriggers.emplace_back();
+
+	listAddClicked(ui->sceneTriggers,
+		       new SceneTriggerWidget(this,
+					      &switcher->sceneTriggers.back()),
+		       ui->triggerAdd, &addPulse);
+
+	ui->triggerHelp->setVisible(false);
+}
+
+void AdvSceneSwitcher::on_triggerRemove_clicked()
+{
+	QListWidgetItem *item = ui->sceneTriggers->currentItem();
+	if (!item) {
+		return;
+	}
+
+	{
+		std::lock_guard<std::mutex> lock(switcher->m);
+		int idx = ui->sceneTriggers->currentRow();
+		auto &switches = switcher->sceneTriggers;
+		switches.erase(switches.begin() + idx);
+	}
+
+	delete item;
+}
+
+void AdvSceneSwitcher::on_triggerUp_clicked()
+{
+	int index = ui->sceneTriggers->currentRow();
+	if (!listMoveUp(ui->sceneTriggers)) {
+		return;
+	}
+
+	SceneTriggerWidget *s1 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index));
+	SceneTriggerWidget *s2 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index - 1));
+	SceneTriggerWidget::swapSwitchData(s1, s2);
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+
+	std::swap(switcher->sceneTriggers[index],
+		  switcher->sceneTriggers[index - 1]);
+}
+
+void AdvSceneSwitcher::on_triggerDown_clicked()
+{
+	int index = ui->sceneTriggers->currentRow();
+
+	if (!listMoveDown(ui->sceneTriggers)) {
+		return;
+	}
+
+	SceneTriggerWidget *s1 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index));
+	SceneTriggerWidget *s2 =
+		(SceneTriggerWidget *)ui->sceneTriggers->itemWidget(
+			ui->sceneTriggers->item(index + 1));
+	SceneTriggerWidget::swapSwitchData(s1, s2);
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+
+	std::swap(switcher->sceneTriggers[index],
+		  switcher->sceneTriggers[index + 1]);
+}
+
+void SceneTrigger::logMatch()
+{
+	std::string sceneName = "";
+	std::string statusName = "";
+	std::string actionName = "";
+
+	switch (triggerType) {
+	case sceneTriggerType::NONE:
+		statusName = "NONE";
+		break;
+	case sceneTriggerType::SCENE_ACTIVE:
+		statusName = "SCENE ACTIVE";
+		break;
+	case sceneTriggerType::SCENE_INACTIVE:
+		statusName = "SCENE INACTIVE";
+		break;
+	case sceneTriggerType::SCENE_LEAVE:
+		statusName = "SCENE LEAVE";
+		break;
+	default:
+		break;
+	}
+
+	switch (triggerAction) {
+	case sceneTriggerAction::NONE:
+		actionName = "NONE";
+		break;
+	case sceneTriggerAction::START_RECORDING:
+		actionName = "START RECORDING";
+		break;
+	case sceneTriggerAction::PAUSE_RECORDING:
+		actionName = "PAUSE RECORDING";
+		break;
+	case sceneTriggerAction::UNPAUSE_RECORDING:
+		actionName = "UNPAUSE RECORDING";
+		break;
+	case sceneTriggerAction::STOP_RECORDING:
+		actionName = "STOP RECORDING";
+		break;
+	case sceneTriggerAction::START_STREAMING:
+		actionName = "START STREAMING";
+		break;
+	case sceneTriggerAction::STOP_STREAMING:
+		actionName = "STOP STREAMING";
+		break;
+	case sceneTriggerAction::START_REPLAY_BUFFER:
+		actionName = "START REPLAY BUFFER";
+		break;
+	case sceneTriggerAction::STOP_REPLAY_BUFFER:
+		actionName = "STOP REPLAY BUFFER";
+		break;
+	case sceneTriggerAction::MUTE_SOURCE:
+		actionName = "MUTE (" + GetWeakSourceName(audioSource) + ")";
+		break;
+	case sceneTriggerAction::UNMUTE_SOURCE:
+		actionName = "UNMUTE (" + GetWeakSourceName(audioSource) + ")";
+		break;
+	case sceneTriggerAction::START_SWITCHER:
+		actionName = "START SCENE SWITCHER";
+		break;
+	case sceneTriggerAction::STOP_SWITCHER:
+		actionName = "STOP SCENE SWITCHER";
+		break;
+	case sceneTriggerAction::START_VCAM:
+		actionName = "START VIRTUAL CAMERA";
+		break;
+	case sceneTriggerAction::STOP_VCAM:
+		actionName = "STOP VIRTUAL CAMERA";
+		break;
+	default:
+		actionName = "UNKNOWN";
+		break;
+	}
+
+	blog(LOG_INFO,
+	     "scene '%s' in status '%s' triggering action '%s' after %f seconds",
+	     GetWeakSourceName(scene).c_str(), statusName.c_str(),
+	     actionName.c_str(), duration.Seconds());
+}
+
+void frontEndActionThread(sceneTriggerAction action, double delay)
+{
+	long long mil = delay * 1000;
+	std::this_thread::sleep_for(std::chrono::milliseconds(mil));
+
+	switch (action) {
+	case sceneTriggerAction::NONE:
+		break;
+	case sceneTriggerAction::START_RECORDING:
+		obs_frontend_recording_start();
+		break;
+	case sceneTriggerAction::PAUSE_RECORDING:
+		obs_frontend_recording_pause(true);
+		break;
+	case sceneTriggerAction::UNPAUSE_RECORDING:
+		obs_frontend_recording_pause(false);
+		break;
+	case sceneTriggerAction::STOP_RECORDING:
+		obs_frontend_recording_stop();
+		break;
+	case sceneTriggerAction::START_STREAMING:
+		obs_frontend_streaming_start();
+		break;
+	case sceneTriggerAction::STOP_STREAMING:
+		obs_frontend_streaming_stop();
+		break;
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(26, 0, 0)
+	case sceneTriggerAction::START_REPLAY_BUFFER:
+		obs_frontend_replay_buffer_start();
+		break;
+	case sceneTriggerAction::STOP_REPLAY_BUFFER:
+		obs_frontend_replay_buffer_stop();
+		break;
+#endif
+#if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(27, 0, 0)
+	case sceneTriggerAction::START_VCAM:
+		obs_frontend_start_virtualcam();
+		break;
+	case sceneTriggerAction::STOP_VCAM:
+		obs_frontend_stop_virtualcam();
+		break;
+#endif
+	default:
+		blog(LOG_WARNING, "ignoring unexpected frontend action '%d'",
+		     static_cast<int>(action));
+		break;
+	}
+}
+
+void muteThread(OBSWeakSource source, double delay, bool mute)
+{
+	long long mil = delay * 1000;
+	std::this_thread::sleep_for(std::chrono::milliseconds(mil));
+
+	auto s = obs_weak_source_get_source(source);
+	obs_source_set_muted(s, mute);
+	obs_source_release(s);
+}
+
+void statusThread(double delay, bool stop)
+{
+	long long mil = delay * 1000;
+	std::this_thread::sleep_for(std::chrono::milliseconds(mil));
+
+	if (stop) {
+		switcher->Stop();
+	} else {
+		switcher->Start();
+	}
+}
+
+bool isFrontendAction(sceneTriggerAction triggerAction)
+{
+	return triggerAction == sceneTriggerAction::START_RECORDING ||
+	       triggerAction == sceneTriggerAction::PAUSE_RECORDING ||
+	       triggerAction == sceneTriggerAction::UNPAUSE_RECORDING ||
+	       triggerAction == sceneTriggerAction::STOP_RECORDING ||
+	       triggerAction == sceneTriggerAction::START_STREAMING ||
+	       triggerAction == sceneTriggerAction::STOP_STREAMING ||
+	       triggerAction == sceneTriggerAction::START_REPLAY_BUFFER ||
+	       triggerAction == sceneTriggerAction::STOP_REPLAY_BUFFER ||
+	       triggerAction == sceneTriggerAction::START_VCAM ||
+	       triggerAction == sceneTriggerAction::STOP_VCAM;
+}
+
+bool isAudioAction(sceneTriggerAction t)
+{
+	return t == sceneTriggerAction::MUTE_SOURCE ||
+	       t == sceneTriggerAction::UNMUTE_SOURCE;
+}
+
+bool isSwitcherStatusAction(sceneTriggerAction t)
+{
+	return t == sceneTriggerAction::START_SWITCHER ||
+	       t == sceneTriggerAction::STOP_SWITCHER;
+}
+
+void SceneTrigger::performAction()
+{
+	if (triggerAction == sceneTriggerAction::NONE) {
+		return;
+	}
+
+	std::thread t;
+
+	if (isFrontendAction(triggerAction)) {
+		t = std::thread(frontEndActionThread, triggerAction,
+				duration.Seconds());
+	} else if (isAudioAction(triggerAction)) {
+		bool mute = triggerAction == sceneTriggerAction::MUTE_SOURCE;
+		t = std::thread(muteThread, audioSource, duration.Seconds(),
+				mute);
+	} else if (isSwitcherStatusAction(triggerAction)) {
+		bool stop = triggerAction == sceneTriggerAction::STOP_SWITCHER;
+		t = std::thread(statusThread, duration.Seconds(), stop);
+	} else {
+		blog(LOG_WARNING, "ignoring unknown action '%d'",
+		     static_cast<int>(triggerAction));
+	}
+
+	t.detach();
+}
+
+bool SceneTrigger::checkMatch(OBSWeakSource currentScene,
+			      OBSWeakSource previousScene)
+{
+	switch (triggerType) {
+	case sceneTriggerType::NONE:
+		return false;
+	case sceneTriggerType::SCENE_ACTIVE:
+		return currentScene == scene;
+	case sceneTriggerType::SCENE_INACTIVE:
+		return currentScene != scene;
+	case sceneTriggerType::SCENE_LEAVE:
+		return previousScene == scene;
+	}
+	return false;
+}
+
+void SwitcherData::checkTriggers()
+{
+	if (SceneTrigger::pause) {
+		return;
+	}
+
+	for (auto &t : sceneTriggers) {
+		if (stop && !isSwitcherStatusAction(t.triggerAction)) {
+			continue;
+		}
+
+		if (t.checkMatch(currentScene, previousScene)) {
+			t.logMatch();
+			t.performAction();
+		}
+	}
+}
+
+void SwitcherData::saveSceneTriggers(obs_data_t *obj)
+{
+	obs_data_array_t *triggerArray = obs_data_array_create();
+	for (auto &s : sceneTriggers) {
+		obs_data_t *array_obj = obs_data_create();
+
+		s.save(array_obj);
+		obs_data_array_push_back(triggerArray, array_obj);
+
+		obs_data_release(array_obj);
+	}
+	obs_data_set_array(obj, "triggers", triggerArray);
+	obs_data_array_release(triggerArray);
+}
+
+void SwitcherData::loadSceneTriggers(obs_data_t *obj)
+{
+	sceneTriggers.clear();
+
+	obs_data_array_t *triggerArray = obs_data_get_array(obj, "triggers");
+	size_t count = obs_data_array_count(triggerArray);
+
+	for (size_t i = 0; i < count; i++) {
+		obs_data_t *array_obj = obs_data_array_item(triggerArray, i);
+
+		sceneTriggers.emplace_back();
+		sceneTriggers.back().load(array_obj);
+
+		obs_data_release(array_obj);
+	}
+	obs_data_array_release(triggerArray);
+}
+
+void AdvSceneSwitcher::SetupTriggerTab()
+{
+	for (auto &s : switcher->sceneTriggers) {
+		QListWidgetItem *item;
+		item = new QListWidgetItem(ui->sceneTriggers);
+		ui->sceneTriggers->addItem(item);
+		SceneTriggerWidget *sw = new SceneTriggerWidget(this, &s);
+		item->setSizeHint(sw->minimumSizeHint());
+		ui->sceneTriggers->setItemWidget(item, sw);
+	}
+
+	if (switcher->sceneTriggers.size() == 0) {
+		if (!switcher->disableHints) {
+			addPulse =
+				PulseWidget(ui->triggerAdd, QColor(Qt::green));
+		}
+		ui->triggerHelp->setVisible(true);
+	} else {
+		ui->triggerHelp->setVisible(false);
+	}
+}
+
+void SceneTrigger::save(obs_data_t *obj)
+{
+	obs_data_set_string(obj, "scene", GetWeakSourceName(scene).c_str());
+	obs_data_set_int(obj, "triggerType", static_cast<int>(triggerType));
+	obs_data_set_int(obj, "triggerAction", static_cast<int>(triggerAction));
+	duration.Save(obj, "duration");
+	obs_data_set_string(obj, "audioSource",
+			    GetWeakSourceName(audioSource).c_str());
+}
+
+void SceneTrigger::load(obs_data_t *obj)
+{
+	const char *sceneName = obs_data_get_string(obj, "scene");
+	scene = GetWeakSourceByName(sceneName);
+
+	triggerType = static_cast<sceneTriggerType>(
+		obs_data_get_int(obj, "triggerType"));
+	triggerAction = static_cast<sceneTriggerAction>(
+		obs_data_get_int(obj, "triggerAction"));
+	duration.Load(obj, "duration");
+
+	const char *audioSourceName = obs_data_get_string(obj, "audioSource");
+	audioSource = GetWeakSourceByName(audioSourceName);
+}
+
+static inline void populateTriggers(QComboBox *list)
+{
+	AddSelectionEntry(
+		list,
+		obs_module_text(
+			"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.none"));
+
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneActive"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneInactive"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerType.sceneLeave"));
+}
+
+inline void populateActions(QComboBox *list)
+{
+	AddSelectionEntry(
+		list,
+		obs_module_text(
+			"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.none"));
+
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.pauseRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unpauseRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopRecording"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startStreaming"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopStreaming"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startReplayBuffer"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopReplayBuffer"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.muteSource"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.unmuteSource"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startSwitcher"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopSwitcher"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.startVirtualCamera"));
+	list->addItem(obs_module_text(
+		"AdvSceneSwitcher.sceneTriggerTab.sceneTriggerAction.stopVirtualCamera"));
+}
+
+SceneTriggerWidget::SceneTriggerWidget(QWidget *parent, SceneTrigger *s)
+	: SwitchWidget(parent, s, false, false)
+{
+	triggers = new QComboBox();
+	actions = new QComboBox();
+	duration = new DurationSelection();
+	audioSources = new QComboBox();
+
+	QWidget::connect(triggers, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(TriggerTypeChanged(int)));
+	QWidget::connect(actions, SIGNAL(currentIndexChanged(int)), this,
+			 SLOT(TriggerActionChanged(int)));
+	QWidget::connect(duration, SIGNAL(DurationChanged(const Duration &)),
+			 this, SLOT(DurationChanged(const Duration &)));
+	QWidget::connect(audioSources,
+			 SIGNAL(currentTextChanged(const QString &)), this,
+			 SLOT(AudioSourceChanged(const QString &)));
+
+	populateTriggers(triggers);
+	populateActions(actions);
+	PopulateAudioSelection(audioSources);
+
+	if (s) {
+		triggers->setCurrentIndex(static_cast<int>(s->triggerType));
+		actions->setCurrentIndex(static_cast<int>(s->triggerAction));
+		duration->SetDuration(s->duration);
+
+		audioSources->setCurrentText(
+			GetWeakSourceName(s->audioSource).c_str());
+
+		if (isAudioAction(s->triggerAction)) {
+			audioSources->show();
+		} else {
+			audioSources->hide();
+		}
+	}
+
+	QHBoxLayout *mainLayout = new QHBoxLayout;
+	std::unordered_map<std::string, QWidget *> widgetPlaceholders = {
+		{"{{triggers}}", triggers},
+		{"{{actions}}", actions},
+		{"{{audioSources}}", audioSources},
+		{"{{duration}}", duration},
+		{"{{scenes}}", scenes}};
+	PlaceWidgets(obs_module_text("AdvSceneSwitcher.sceneTriggerTab.entry"),
+		     mainLayout, widgetPlaceholders);
+	setLayout(mainLayout);
+
+	switchData = s;
+
+	loading = false;
+}
+
+SceneTrigger *SceneTriggerWidget::getSwitchData()
+{
+	return switchData;
+}
+
+void SceneTriggerWidget::setSwitchData(SceneTrigger *s)
+{
+	switchData = s;
+}
+
+void SceneTriggerWidget::swapSwitchData(SceneTriggerWidget *s1,
+					SceneTriggerWidget *s2)
+{
+	SwitchWidget::swapSwitchData(s1, s2);
+
+	SceneTrigger *t = s1->getSwitchData();
+	s1->setSwitchData(s2->getSwitchData());
+	s2->setSwitchData(t);
+}
+
+void SceneTriggerWidget::TriggerTypeChanged(int index)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switchData->triggerType = static_cast<sceneTriggerType>(index);
+}
+
+void SceneTriggerWidget::TriggerActionChanged(int index)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	{
+		std::lock_guard<std::mutex> lock(switcher->m);
+		switchData->triggerAction =
+			static_cast<sceneTriggerAction>(index);
+	}
+
+	if (isAudioAction(switchData->triggerAction)) {
+		audioSources->show();
+	} else {
+		audioSources->hide();
+	}
+}
+
+void SceneTriggerWidget::DurationChanged(const Duration &duration)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switchData->duration = duration;
+}
+
+void SceneTriggerWidget::AudioSourceChanged(const QString &text)
+{
+	if (loading || !switchData) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switchData->audioSource = GetWeakSourceByQString(text);
+}
+
+} // namespace advss
--- a/lib/legacy/scene-trigger.hpp
+++ b/lib/legacy/scene-trigger.hpp
@@ -0,0 +1,88 @@
+/******************************************************************************
+    Note: Long-term goal is to remove this tab / file.
+    Most functionality shall be moved to the Macro tab instead.
+
+    So if you plan to make changes here, please consider applying them to the
+    corresponding macro tab functionality instead.
+******************************************************************************/
+#pragma once
+
+#include "switch-generic.hpp"
+#include "duration-control.hpp"
+
+namespace advss {
+
+enum class sceneTriggerType {
+	NONE = 0,
+	SCENE_ACTIVE = 1,
+	SCENE_INACTIVE = 2,
+	SCENE_LEAVE = 3,
+};
+
+enum class sceneTriggerAction {
+	NONE = 0,
+	START_RECORDING,
+	PAUSE_RECORDING,
+	UNPAUSE_RECORDING,
+	STOP_RECORDING,
+
+	START_STREAMING,
+	STOP_STREAMING,
+
+	START_REPLAY_BUFFER,
+	STOP_REPLAY_BUFFER,
+
+	MUTE_SOURCE,
+	UNMUTE_SOURCE,
+
+	START_SWITCHER,
+	STOP_SWITCHER,
+
+	START_VCAM,
+	STOP_VCAM,
+};
+
+struct SceneTrigger : SceneSwitcherEntry {
+	static bool pause;
+	sceneTriggerType triggerType = sceneTriggerType::NONE;
+	sceneTriggerAction triggerAction = sceneTriggerAction::NONE;
+	Duration duration;
+	OBSWeakSource audioSource = nullptr;
+
+	const char *getType() { return "trigger"; }
+	void save(obs_data_t *obj);
+	void load(obs_data_t *obj);
+
+	bool checkMatch(OBSWeakSource currentScene,
+			OBSWeakSource previousScene);
+	void performAction();
+	void logMatch();
+};
+
+class SceneTriggerWidget : public SwitchWidget {
+	Q_OBJECT
+
+public:
+	SceneTriggerWidget(QWidget *parent, SceneTrigger *s);
+	SceneTrigger *getSwitchData();
+	void setSwitchData(SceneTrigger *s);
+
+	static void swapSwitchData(SceneTriggerWidget *s1,
+				   SceneTriggerWidget *s2);
+
+private slots:
+	void TriggerTypeChanged(int index);
+	void TriggerActionChanged(int index);
+	void DurationChanged(const Duration &);
+	void AudioSourceChanged(const QString &text);
+
+private:
+	QComboBox *triggers;
+	QComboBox *actions;
+	DurationSelection *duration;
+	QComboBox *audioSources;
+
+	SceneTrigger *switchData;
+};
+
+} // namespace advss
--- a/lib/legacy/switch-audio.cpp
+++ b/lib/legacy/switch-audio.cpp
@@ -12,7 +12,7 @@
 namespace advss {

 bool AudioSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_audioAdd_clicked()
 {
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_audioAdd_clicked()
 	AudioSwitchWidget *sw =
 		new AudioSwitchWidget(this, &switcher->audioSwitches.back());

-	listAddClicked(ui->audioSwitches, sw, &addPulse);
+	listAddClicked(ui->audioSwitches, sw, ui->audioAdd, &addPulse);

 	ui->audioHelp->setVisible(false);
 }
@@ -232,8 +232,7 @@ void AdvSceneSwitcher::SetupAudioTab()

 	if (switcher->audioSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->audioAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->audioAdd, QColor(Qt::green));
 		}
 		ui->audioHelp->setVisible(true);
 	} else {
@@ -259,8 +258,7 @@ void AudioSwitch::setVolumeLevel(void *data, const float *,
 	}
 }

-static obs_volmeter_t *addVolmeterToSource(AudioSwitch *entry,
-					   obs_weak_source *source)
+obs_volmeter_t *AddVolmeterToSource(AudioSwitch *entry, obs_weak_source *source)
 {
 	obs_volmeter_t *volmeter = obs_volmeter_create(OBS_FADER_LOG);
 	obs_volmeter_add_callback(volmeter, AudioSwitch::setVolumeLevel, entry);
@@ -280,7 +278,7 @@ void AudioSwitch::resetVolmeter()
 	obs_volmeter_remove_callback(volmeter, setVolumeLevel, this);
 	obs_volmeter_destroy(volmeter);

-	volmeter = addVolmeterToSource(this, audioSource);
+	volmeter = AddVolmeterToSource(this, audioSource);
 }

 bool AudioSwitch::initialized()
@@ -319,7 +317,7 @@ void AudioSwitch::load(obs_data_t *obj)
 	duration.Load(obj, "duration");
 	ignoreInactiveSource = obs_data_get_bool(obj, "ignoreInactiveSource");

-	volmeter = addVolmeterToSource(this, audioSource);
+	volmeter = AddVolmeterToSource(this, audioSource);
 }

 void AudioSwitchFallback::save(obs_data_t *obj)
@@ -350,7 +348,7 @@ AudioSwitch::AudioSwitch(const AudioSwitch &other)
 	  condition(other.condition),
 	  duration(other.duration)
 {
-	volmeter = addVolmeterToSource(this, other.audioSource);
+	volmeter = AddVolmeterToSource(this, other.audioSource);
 }

 AudioSwitch::AudioSwitch(AudioSwitch &&other) noexcept
--- a/lib/legacy/switch-executable.cpp
+++ b/lib/legacy/switch-executable.cpp
@@ -9,7 +9,7 @@
 namespace advss {

 bool ExecutableSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_executableAdd_clicked()
 {
@@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_executableAdd_clicked()
 	listAddClicked(ui->executables,
 		       new ExecutableSwitchWidget(
 			       this, &switcher->executableSwitches.back()),
-		       &addPulse);
+		       ui->executableAdd, &addPulse);

 	ui->exeHelp->setVisible(false);
 }
@@ -177,8 +177,8 @@ void AdvSceneSwitcher::SetupExecutableTab()

 	if (switcher->executableSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->executableAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->executableAdd,
+					       QColor(Qt::green));
 		}
 		ui->exeHelp->setVisible(true);
 	} else {
--- a/lib/legacy/switch-file.cpp
+++ b/lib/legacy/switch-file.cpp
@@ -18,32 +18,9 @@
 namespace advss {

 bool FileSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;
 static std::hash<std::string> strHash;

-static void writeToStatusFile(const QString &msg)
-{
-	if (!GetSwitcher() || !GetSwitcher()->fileIO.writeEnabled ||
-	    GetSwitcher()->fileIO.writePath.empty()) {
-		return;
-	}
-
-	QFile file(QString::fromStdString(GetSwitcher()->fileIO.writePath));
-	if (file.open(QIODevice::ReadWrite)) {
-		QTextStream stream(&file);
-		stream << msg << Qt::endl;
-	}
-	file.close();
-}
-
-static bool _ = []() {
-	AddStartStep(
-		[]() { writeToStatusFile("Advanced Scene Switcher running"); });
-	AddStopStep(
-		[]() { writeToStatusFile("Advanced Scene Switcher stopped"); });
-	return true;
-}();
-
 void AdvSceneSwitcher::on_browseButton_clicked()
 {
 	QString path = QFileDialog::getOpenFileName(
@@ -136,6 +113,24 @@ void SwitcherData::writeSceneInfoToFile()
 	}
 }

+void SwitcherData::writeToStatusFile(const QString &msg)
+{
+	if (!fileIO.writeEnabled || fileIO.writePath.empty()) {
+		return;
+	}
+
+	QFile file(QString::fromStdString(fileIO.writePath));
+	if (file.open(QIODevice::ReadWrite)) {
+		QTextStream stream(&file);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+		stream << msg << "\n";
+#else
+		stream << msg << Qt::endl;
+#endif
+	}
+	file.close();
+}
+
 bool SwitcherData::checkSwitchInfoFromFile(OBSWeakSource &scene,
 					   OBSWeakSource &transition)
 {
@@ -296,7 +291,7 @@ void AdvSceneSwitcher::on_fileAdd_clicked()
 	listAddClicked(ui->fileSwitches,
 		       new FileSwitchWidget(this,
 					    &switcher->fileSwitches.back()),
-		       &addPulse);
+		       ui->fileAdd, &addPulse);

 	ui->fileHelp->setVisible(false);
 }
@@ -446,8 +441,7 @@ void AdvSceneSwitcher::SetupFileTab()

 	if (switcher->fileSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse =
-				HighlightWidget(ui->fileAdd, QColor(Qt::green));
+			addPulse = PulseWidget(ui->fileAdd, QColor(Qt::green));
 		}
 		ui->fileHelp->setVisible(true);
 	} else {
--- a/lib/legacy/switch-media.cpp
+++ b/lib/legacy/switch-media.cpp
@@ -9,7 +9,7 @@
 namespace advss {

 bool MediaSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 constexpr auto media_played_to_end_idx = 8;
 constexpr auto media_any_idx = 9;
@@ -22,7 +22,7 @@ void AdvSceneSwitcher::on_mediaAdd_clicked()
 	listAddClicked(ui->mediaSwitches,
 		       new MediaSwitchWidget(this,
 					     &switcher->mediaSwitches.back()),
-		       &addPulse);
+		       ui->mediaAdd, &addPulse);

 	ui->mediaHelp->setVisible(false);
 }
@@ -252,8 +252,7 @@ void AdvSceneSwitcher::SetupMediaTab()

 	if (switcher->mediaSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->mediaAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->mediaAdd, QColor(Qt::green));
 		}
 		ui->mediaHelp->setVisible(true);
 	} else {
--- a/lib/legacy/switch-network.cpp
+++ b/lib/legacy/switch-network.cpp
@@ -0,0 +1,717 @@
+/*
+Most of this code is based on https://github.com/Palakis/obs-websocket
+*/
+
+#include "advanced-scene-switcher.hpp"
+#include "obs-module-helper.hpp"
+#include "scene-switch-helpers.hpp"
+#include "source-helpers.hpp"
+#include "switcher-data.hpp"
+
+#include <obs-frontend-api.h>
+#include <QMessageBox>
+#include <QTime>
+#include <QMainWindow>
+
+namespace advss {
+
+#define PARAM_SERVER_ENABLE "ServerEnabled"
+#define PARAM_SERVER_PORT "ServerPort"
+#define PARAM_LOCKTOIPV4 "LockToIPv4"
+
+#define PARAM_CLIENT_ENABLE "ClientEnabled"
+#define PARAM_CLIENT_PORT "ClientPort"
+#define PARAM_ADDRESS "Address"
+#define PARAM_CLIENT_SEND_SCENE_CHANGE "SendSceneChange"
+#define PARAM_CLIENT_SEND_SCENE_CHANGE_ALL "SendSceneChangeAll"
+#define PARAM_CLIENT_SENDPREVIEW "SendPreview"
+
+#define RECONNECT_DELAY 10
+
+#define SCENE_ENTRY "scene"
+#define TRANSITION_ENTRY "transition"
+#define TRANSITION_DURATION "duration"
+#define SET_PREVIEW "preview"
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+NetworkConfig::NetworkConfig()
+	: ServerEnabled(false),
+	  ServerPort(55555),
+	  LockToIPv4(false),
+	  ClientEnabled(false),
+	  Address(""),
+	  ClientPort(55555),
+	  SendSceneChange(true),
+	  SendSceneChangeAll(true),
+	  SendPreview(true)
+{
+}
+
+void NetworkConfig::Load(obs_data_t *obj)
+{
+	SetDefaults(obj);
+
+	ServerEnabled = obs_data_get_bool(obj, PARAM_SERVER_ENABLE);
+	ServerPort = obs_data_get_int(obj, PARAM_SERVER_PORT);
+	LockToIPv4 = obs_data_get_bool(obj, PARAM_LOCKTOIPV4);
+
+	ClientEnabled = obs_data_get_bool(obj, PARAM_CLIENT_ENABLE);
+	Address = obs_data_get_string(obj, PARAM_ADDRESS);
+	ClientPort = obs_data_get_int(obj, PARAM_CLIENT_PORT);
+	SendSceneChange =
+		obs_data_get_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE);
+	SendSceneChangeAll =
+		obs_data_get_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE_ALL);
+	SendPreview = obs_data_get_bool(obj, PARAM_CLIENT_SENDPREVIEW);
+}
+
+void NetworkConfig::Save(obs_data_t *obj)
+{
+	obs_data_set_bool(obj, PARAM_SERVER_ENABLE, ServerEnabled);
+	obs_data_set_int(obj, PARAM_SERVER_PORT, ServerPort);
+	obs_data_set_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
+
+	obs_data_set_bool(obj, PARAM_CLIENT_ENABLE, ClientEnabled);
+	obs_data_set_string(obj, PARAM_ADDRESS, Address.c_str());
+	obs_data_set_int(obj, PARAM_CLIENT_PORT, ClientPort);
+	obs_data_set_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE, SendSceneChange);
+	obs_data_set_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE_ALL,
+			  SendSceneChangeAll);
+	obs_data_set_bool(obj, PARAM_CLIENT_SENDPREVIEW, SendPreview);
+}
+
+void NetworkConfig::SetDefaults(obs_data_t *obj)
+{
+	obs_data_set_default_bool(obj, PARAM_SERVER_ENABLE, false);
+	obs_data_set_default_int(obj, PARAM_SERVER_PORT, ServerPort);
+	obs_data_set_default_bool(obj, PARAM_LOCKTOIPV4, LockToIPv4);
+
+	obs_data_set_default_bool(obj, PARAM_CLIENT_ENABLE, false);
+	obs_data_set_default_string(obj, PARAM_ADDRESS, Address.c_str());
+	obs_data_set_default_int(obj, PARAM_CLIENT_PORT, ClientPort);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE,
+				  SendSceneChange);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SEND_SCENE_CHANGE_ALL,
+				  SendSceneChangeAll);
+	obs_data_set_default_bool(obj, PARAM_CLIENT_SENDPREVIEW, SendPreview);
+}
+
+std::string NetworkConfig::GetClientUri()
+{
+	return "ws://" + Address + ":" + std::to_string(ClientPort);
+}
+
+bool NetworkConfig::ShouldSendSceneChange()
+{
+	return ServerEnabled && SendSceneChange;
+}
+
+bool NetworkConfig::ShouldSendFrontendSceneChange()
+{
+	return ShouldSendSceneChange() && SendSceneChangeAll;
+}
+
+bool NetworkConfig::ShouldSendPrviewSceneChange()
+{
+	return ServerEnabled && SendPreview;
+}
+
+WSServer::WSServer() : QObject(nullptr), _connections(), _clMutex()
+{
+	_server.get_alog().clear_channels(
+		websocketpp::log::alevel::frame_header |
+		websocketpp::log::alevel::frame_payload |
+		websocketpp::log::alevel::control);
+	_server.init_asio();
+#ifndef _WIN32
+	_server.set_reuse_addr(true);
+#endif
+
+	_server.set_open_handler(bind(&WSServer::onOpen, this, _1));
+	_server.set_close_handler(bind(&WSServer::onClose, this, _1));
+	_server.set_message_handler(bind(&WSServer::onMessage, this, _1, _2));
+}
+
+WSServer::~WSServer()
+{
+	stop();
+}
+
+void WSServer::start(quint16 port, bool lockToIPv4)
+{
+	if (_server.is_listening() &&
+	    (port == _serverPort && _lockToIPv4 == lockToIPv4)) {
+		blog(LOG_INFO,
+		     "WSServer::start: server already on this port and protocol mode. no restart needed");
+		return;
+	}
+
+	if (_server.is_listening()) {
+		stop();
+	}
+
+	_server.reset();
+
+	_serverPort = port;
+	_lockToIPv4 = lockToIPv4;
+
+	websocketpp::lib::error_code errorCode;
+	if (lockToIPv4) {
+		blog(LOG_INFO, "WSServer::start: Locked to IPv4 bindings");
+		_server.listen(websocketpp::lib::asio::ip::tcp::v4(),
+			       _serverPort, errorCode);
+	} else {
+		blog(LOG_INFO, "WSServer::start: Not locked to IPv4 bindings");
+		_server.listen(_serverPort, errorCode);
+	}
+
+	if (errorCode) {
+		std::string errorCodeMessage = errorCode.message();
+		blog(LOG_INFO, "server: listen failed: %s",
+		     errorCodeMessage.c_str());
+
+		QString errorTitle =
+			obs_module_text("AdvSceneSwitcher.windowTitle");
+		QString errorMessage =
+			QString(obs_module_text(
+					"AdvSceneSwitcher.networkTab.startFailed.message"))
+				.arg(_serverPort)
+				.arg(errorCodeMessage.c_str());
+
+		QMainWindow *mainWindow = reinterpret_cast<QMainWindow *>(
+			obs_frontend_get_main_window());
+		QMessageBox::warning(mainWindow, errorTitle, errorMessage);
+
+		return;
+	}
+	switcher->serverStatus = ServerStatus::STARTING;
+
+	_server.start_accept();
+
+	_threadPool.start(Compatability::CreateFunctionRunnable([=]() {
+		blog(LOG_INFO, "WSServer::start: io thread started");
+		_server.run();
+		blog(LOG_INFO, "WSServer::start: io thread exited");
+	}));
+
+	switcher->serverStatus = ServerStatus::RUNNING;
+	blog(LOG_INFO,
+	     "WSServer::start: server started successfully on port %d",
+	     _serverPort);
+}
+
+void WSServer::stop()
+{
+	if (!_server.is_listening()) {
+		return;
+	}
+
+	_server.stop_listening();
+	for (connection_hdl hdl : _connections) {
+		websocketpp::lib::error_code ec;
+		_server.close(hdl, websocketpp::close::status::going_away,
+			      "Server stopping", ec);
+	}
+
+	_threadPool.waitForDone();
+
+	while (_connections.size() > 0) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+	}
+
+	switcher->serverStatus = ServerStatus::NOT_RUNNING;
+	blog(LOG_INFO, "server stopped successfully");
+}
+
+void WSServer::sendMessage(SceneSwitchInfo sceneSwitch, bool preview)
+{
+	if (!sceneSwitch.scene) {
+		return;
+	}
+
+	OBSData data = obs_data_create();
+	obs_data_set_string(data, SCENE_ENTRY,
+			    GetWeakSourceName(sceneSwitch.scene).c_str());
+	obs_data_set_string(data, TRANSITION_ENTRY,
+			    GetWeakSourceName(sceneSwitch.transition).c_str());
+	obs_data_set_int(data, TRANSITION_DURATION, sceneSwitch.duration);
+	obs_data_set_bool(data, SET_PREVIEW, preview);
+	std::string message = obs_data_get_json(data);
+	obs_data_release(data);
+
+	for (connection_hdl hdl : _connections) {
+		websocketpp::lib::error_code ec;
+		_server.send(hdl, message, websocketpp::frame::opcode::text,
+			     ec);
+		if (ec) {
+			std::string errorCodeMessage = ec.message();
+			blog(LOG_INFO, "server: send failed: %s",
+			     errorCodeMessage.c_str());
+		}
+	}
+
+	if (VerboseLoggingEnabled()) {
+		blog(LOG_INFO, "server sent message:\n%s", message.c_str());
+	}
+}
+
+void WSServer::onOpen(connection_hdl hdl)
+{
+	{
+		std::lock_guard<std::recursive_mutex> lock(_clMutex);
+		_connections.insert(hdl);
+	}
+
+	QString clientIp = getRemoteEndpoint(hdl);
+	blog(LOG_INFO, "new client connection from %s",
+	     clientIp.toUtf8().constData());
+}
+
+std::string processMessage(std::string payload)
+{
+	auto config = switcher->networkConfig;
+	std::string msgContainer(payload);
+	const char *msg = msgContainer.c_str();
+
+	OBSData data = obs_data_create_from_json(msg);
+	if (!data) {
+		blog(LOG_ERROR, "invalid JSON payload received for '%s'", msg);
+		return "invalid JSON payload";
+	}
+
+	if (!obs_data_has_user_value(data, SCENE_ENTRY) ||
+	    !obs_data_has_user_value(data, TRANSITION_ENTRY) ||
+	    !obs_data_has_user_value(data, TRANSITION_DURATION) ||
+	    !obs_data_has_user_value(data, SET_PREVIEW)) {
+		return "missing request parameters";
+	}
+
+	std::string sceneName = obs_data_get_string(data, SCENE_ENTRY);
+	std::string transitionName =
+		obs_data_get_string(data, TRANSITION_ENTRY);
+	int duration = obs_data_get_int(data, TRANSITION_DURATION);
+	bool preview = obs_data_get_bool(data, SET_PREVIEW);
+
+	obs_data_release(data);
+
+	auto scene = GetWeakSourceByName(sceneName.c_str());
+	if (!scene) {
+		return "ignoring request - unknown scene '" + sceneName + "'";
+	}
+
+	std::string ret = "message ok";
+
+	auto transition = GetWeakTransitionByName(transitionName.c_str());
+	if (VerboseLoggingEnabled() && !transition) {
+		ret += " - ignoring invalid transition: '" + transitionName +
+		       "'";
+	}
+	if (preview) {
+		SwitchPreviewScene(scene);
+	} else {
+		SwitchScene({scene, transition, duration});
+	}
+	return ret;
+}
+
+void WSServer::onMessage(connection_hdl, server::message_ptr message)
+{
+	auto opcode = message->get_opcode();
+	if (opcode != websocketpp::frame::opcode::text) {
+		return;
+	}
+
+	_threadPool.start(Compatability::CreateFunctionRunnable([=]() {
+		if (message->get_payload() != "message ok") {
+			blog(LOG_WARNING, "received response: %s",
+			     message->get_payload().c_str());
+		}
+	}));
+}
+
+void WSServer::onClose(connection_hdl hdl)
+{
+	{
+		std::lock_guard<std::recursive_mutex> lock(_clMutex);
+		_connections.erase(hdl);
+	}
+
+	auto conn = _server.get_con_from_hdl(hdl);
+	auto localCloseCode = conn->get_local_close_code();
+
+	if (localCloseCode != websocketpp::close::status::going_away) {
+		QString clientIp = getRemoteEndpoint(hdl);
+		blog(LOG_INFO, "client %s disconnected",
+		     clientIp.toUtf8().constData());
+	}
+}
+
+QString WSServer::getRemoteEndpoint(connection_hdl hdl)
+{
+	auto conn = _server.get_con_from_hdl(hdl);
+	return QString::fromStdString(conn->get_remote_endpoint());
+}
+
+WSClient::WSClient() : QObject(nullptr)
+{
+	_client.get_alog().clear_channels(
+		websocketpp::log::alevel::frame_header |
+		websocketpp::log::alevel::frame_payload |
+		websocketpp::log::alevel::control);
+	_client.init_asio();
+#ifndef _WIN32
+	_client.set_reuse_addr(true);
+#endif
+
+	_client.set_open_handler(bind(&WSClient::onOpen, this, _1));
+	_client.set_fail_handler(bind(&WSClient::onFail, this, _1));
+	_client.set_message_handler(bind(&WSClient::onMessage, this, _1, _2));
+	_client.set_close_handler(bind(&WSClient::onClose, this, _1));
+}
+
+WSClient::~WSClient()
+{
+	disconnect();
+}
+
+void WSClient::connectThread()
+{
+	while (_retry) {
+		_client.reset();
+		switcher->clientStatus = ClientStatus::CONNECTING;
+		// Create a connection to the given URI and queue it for connection once
+		// the event loop starts
+		websocketpp::lib::error_code ec;
+		client::connection_ptr con = _client.get_connection(_uri, ec);
+		if (ec) {
+			_failMsg = ec.message();
+			blog(LOG_INFO, "client: connect failed: %s",
+			     _failMsg.c_str());
+			switcher->clientStatus = ClientStatus::FAIL;
+		} else {
+			_client.connect(con);
+			_connection = connection_hdl(con);
+
+			// Start the ASIO io_service run loop
+			blog(LOG_INFO, "WSClient::connect: io thread started");
+			_connected = true;
+			_client.run();
+			_connected = false;
+			blog(LOG_INFO, "WSClient::connect: io thread exited");
+		}
+
+		if (_retry) {
+			std::unique_lock<std::mutex> lck(_waitMtx);
+			blog(LOG_INFO,
+			     "trying to reconnect to %s in %d seconds.",
+			     _uri.c_str(), RECONNECT_DELAY);
+			_cv.wait_for(lck,
+				     std::chrono::seconds(RECONNECT_DELAY));
+		}
+	}
+}
+
+void WSClient::connect(std::string uri)
+{
+	disconnect();
+	_uri = uri;
+	_retry = true;
+
+	_thread = std::thread(&WSClient::connectThread, this);
+
+	switcher->clientStatus = ClientStatus::DISCONNECTED;
+	blog(LOG_INFO, "WSClient::connect: exited");
+}
+
+void WSClient::disconnect()
+{
+	_retry = false;
+	websocketpp::lib::error_code ec;
+	_client.close(_connection, websocketpp::close::status::normal,
+		      "Client stopping", ec);
+
+	{
+		std::unique_lock<std::mutex> waitLck(_waitMtx);
+		blog(LOG_INFO, "trying to reconnect to %s in %d seconds.",
+		     _uri.c_str(), RECONNECT_DELAY);
+		_cv.notify_all();
+	}
+
+	while (_connected) {
+		std::this_thread::sleep_for(std::chrono::milliseconds(10));
+		_client.close(_connection, websocketpp::close::status::normal,
+			      "Client stopping", ec);
+	}
+
+	if (_thread.joinable()) {
+		_thread.join();
+	}
+}
+
+void WSClient::onOpen(connection_hdl)
+{
+	blog(LOG_INFO, "connection to %s opened", _uri.c_str());
+	switcher->clientStatus = ClientStatus::CONNECTED;
+}
+
+void WSClient::onFail(connection_hdl)
+{
+	blog(LOG_INFO, "connection to %s failed", _uri.c_str());
+}
+
+void WSClient::onMessage(connection_hdl hdl, client::message_ptr message)
+{
+	auto opcode = message->get_opcode();
+	if (opcode != websocketpp::frame::opcode::text) {
+		return;
+	}
+
+	std::string payload = message->get_payload();
+	std::string response = processMessage(payload);
+	websocketpp::lib::error_code errorCode;
+	_client.send(hdl, response, websocketpp::frame::opcode::text,
+		     errorCode);
+
+	if (errorCode) {
+		std::string errorCodeMessage = errorCode.message();
+		blog(LOG_INFO, "client(response): send failed: %s",
+		     errorCodeMessage.c_str());
+	}
+
+	if (VerboseLoggingEnabled()) {
+		blog(LOG_INFO, "client sent message:\n%s", response.c_str());
+	}
+}
+
+void WSClient::onClose(connection_hdl)
+{
+	blog(LOG_INFO, "client-connection to %s closed.", _uri.c_str());
+	switcher->clientStatus = ClientStatus::DISCONNECTED;
+}
+
+void SwitcherData::loadNetworkSettings(obs_data_t *obj)
+{
+	networkConfig.Load(obj);
+}
+
+void SwitcherData::saveNetworkSwitches(obs_data_t *obj)
+{
+	networkConfig.Save(obj);
+	if (!networkConfig.ServerEnabled) {
+		server.stop();
+	}
+}
+
+void AdvSceneSwitcher::SetupNetworkTab()
+{
+	ui->serverSettings->setChecked(switcher->networkConfig.ServerEnabled);
+	ui->serverPort->setValue(switcher->networkConfig.ServerPort);
+	ui->lockToIPv4->setChecked(switcher->networkConfig.LockToIPv4);
+
+	ui->clientSettings->setChecked(switcher->networkConfig.ClientEnabled);
+	ui->clientHostname->setText(switcher->networkConfig.Address.c_str());
+	ui->clientPort->setValue(switcher->networkConfig.ClientPort);
+	ui->sendSceneChange->setChecked(
+		switcher->networkConfig.SendSceneChange);
+	ui->restrictSend->setChecked(
+		!switcher->networkConfig.SendSceneChangeAll);
+	ui->sendPreview->setChecked(switcher->networkConfig.SendPreview);
+	ui->restrictSend->setDisabled(!switcher->networkConfig.SendSceneChange);
+
+	QTimer *statusTimer = new QTimer(this);
+	connect(statusTimer, SIGNAL(timeout()), this,
+		SLOT(UpdateClientStatus()));
+	connect(statusTimer, SIGNAL(timeout()), this,
+		SLOT(UpdateServerStatus()));
+	statusTimer->start(500);
+}
+
+void AdvSceneSwitcher::on_serverSettings_toggled(bool on)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ServerEnabled = on;
+	if (on) {
+		switcher->server.start(switcher->networkConfig.ServerPort,
+				       switcher->networkConfig.LockToIPv4);
+	} else {
+		switcher->server.stop();
+	}
+}
+
+void AdvSceneSwitcher::on_serverPort_valueChanged(int value)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ServerPort = value;
+}
+
+void AdvSceneSwitcher::on_lockToIPv4_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.LockToIPv4 = state;
+}
+
+void AdvSceneSwitcher::on_serverRestart_clicked()
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->server.start(switcher->networkConfig.ServerPort,
+			       switcher->networkConfig.LockToIPv4);
+}
+
+void AdvSceneSwitcher::UpdateServerStatus()
+{
+	switch (switcher->serverStatus) {
+	case ServerStatus::NOT_RUNNING:
+		ui->serverStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.server.status.notRunning"));
+		break;
+	case ServerStatus::STARTING:
+		ui->serverStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.server.status.starting"));
+		break;
+	case ServerStatus::RUNNING:
+		ui->serverStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.server.status.running"));
+		break;
+	default:
+		break;
+	}
+}
+
+void AdvSceneSwitcher::on_clientSettings_toggled(bool on)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ClientEnabled = on;
+
+	if (on) {
+		switcher->client.connect(
+			switcher->networkConfig.GetClientUri());
+	} else {
+		switcher->client.disconnect();
+	}
+}
+
+void AdvSceneSwitcher::on_clientHostname_textChanged(const QString &text)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.Address = text.toUtf8().constData();
+}
+
+void AdvSceneSwitcher::on_clientPort_valueChanged(int value)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.ClientPort = value;
+}
+
+void AdvSceneSwitcher::on_sendSceneChange_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.SendSceneChange = state;
+	ui->restrictSend->setDisabled(!state);
+}
+
+void AdvSceneSwitcher::on_restrictSend_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.SendSceneChangeAll = !state;
+}
+
+void AdvSceneSwitcher::on_sendPreview_stateChanged(int state)
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->networkConfig.SendPreview = state;
+}
+
+void AdvSceneSwitcher::on_clientReconnect_clicked()
+{
+	if (loading) {
+		return;
+	}
+
+	std::lock_guard<std::mutex> lock(switcher->m);
+	switcher->client.connect(switcher->networkConfig.GetClientUri());
+}
+
+void AdvSceneSwitcher::UpdateClientStatus()
+{
+	switch (switcher->clientStatus) {
+	case ClientStatus::DISCONNECTED:
+		ui->clientStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.client.status.disconnected"));
+		break;
+	case ClientStatus::CONNECTING:
+		ui->clientStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.client.status.connecting"));
+		break;
+	case ClientStatus::CONNECTED:
+		ui->clientStatus->setText(obs_module_text(
+			"AdvSceneSwitcher.networkTab.client.status.connected"));
+		break;
+	case ClientStatus::FAIL:
+		ui->clientStatus->setText(QString("Error: ") +
+					  switcher->client.getFail().c_str());
+		break;
+	default:
+		break;
+	}
+}
+
+void Compatability::StdFunctionRunnable::run()
+{
+	cb();
+}
+
+QRunnable *Compatability::CreateFunctionRunnable(std::function<void()> func)
+{
+	return new Compatability::StdFunctionRunnable(std::move(func));
+}
+
+Compatability::StdFunctionRunnable::StdFunctionRunnable(
+	std::function<void()> func)
+	: cb(std::move(func))
+{
+}
+
+} // namespace advss
--- a/lib/legacy/switch-network.hpp
+++ b/lib/legacy/switch-network.hpp
@@ -0,0 +1,137 @@
+/*
+Most of this code is based on https://github.com/Palakis/obs-websocket
+*/
+
+#pragma once
+
+#include <set>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QVariantHash>
+#include <QtCore/QThreadPool>
+#include <mutex>
+#include <condition_variable>
+#include <functional>
+#include <QRunnable>
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+#include <websocketpp/client.hpp>
+
+namespace advss {
+
+using websocketpp::connection_hdl;
+typedef websocketpp::server<websocketpp::config::asio> server;
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+struct SceneSwitchInfo;
+
+class NetworkConfig {
+public:
+	NetworkConfig();
+	void Load(obs_data_t *obj);
+	void Save(obs_data_t *obj);
+	void SetDefaults(obs_data_t *obj);
+
+	std::string GetClientUri();
+
+	bool ShouldSendSceneChange();
+	bool ShouldSendFrontendSceneChange();
+	bool ShouldSendPrviewSceneChange();
+
+	// Server
+	bool ServerEnabled;
+	uint64_t ServerPort;
+	bool LockToIPv4;
+
+	// Client
+	bool ClientEnabled;
+	std::string Address;
+	uint64_t ClientPort;
+	bool SendSceneChange;
+	bool SendSceneChangeAll;
+	bool SendPreview;
+};
+
+class WSServer : public QObject {
+	Q_OBJECT
+
+public:
+	explicit WSServer();
+	virtual ~WSServer();
+	void start(quint16 port, bool lockToIPv4);
+	void stop();
+	void sendMessage(SceneSwitchInfo sceneSwitch, bool preview = false);
+	QThreadPool *threadPool() { return &_threadPool; }
+
+private:
+	void onOpen(connection_hdl hdl);
+	void onMessage(connection_hdl hdl, server::message_ptr message);
+	void onClose(connection_hdl hdl);
+
+	QString getRemoteEndpoint(connection_hdl hdl);
+
+	server _server;
+	quint16 _serverPort = 55555;
+	bool _lockToIPv4 = false;
+	std::set<connection_hdl, std::owner_less<connection_hdl>> _connections;
+	std::recursive_mutex _clMutex;
+	QThreadPool _threadPool;
+};
+
+enum class ServerStatus {
+	NOT_RUNNING,
+	STARTING,
+	RUNNING,
+};
+
+class WSClient : public QObject {
+	Q_OBJECT
+
+public:
+	explicit WSClient();
+	virtual ~WSClient();
+	void connect(std::string uri);
+	void disconnect();
+	std::string getFail() { return _failMsg; }
+
+private:
+	void onOpen(connection_hdl hdl);
+	void onFail(connection_hdl hdl);
+	void onMessage(connection_hdl hdl, client::message_ptr message);
+	void onClose(connection_hdl hdl);
+	void connectThread();
+
+	client _client;
+	std::string _uri;
+	connection_hdl _connection;
+	std::thread _thread;
+	bool _retry = false;
+	std::atomic_bool _connected = {false};
+	std::mutex _waitMtx;
+	std::condition_variable _cv;
+	std::string _failMsg;
+};
+
+enum class ClientStatus {
+	DISCONNECTED,
+	CONNECTING,
+	CONNECTED,
+	FAIL,
+};
+
+namespace Compatability {
+// Reimplement QRunnable for std::function. Retrocompatability for Qt < 5.15
+class StdFunctionRunnable : public QRunnable {
+	std::function<void()> cb;
+
+public:
+	StdFunctionRunnable(std::function<void()> func);
+	void run() override;
+};
+
+QRunnable *CreateFunctionRunnable(std::function<void()> func);
+} // namespace Compatability
+
+} // namespace advss
--- a/lib/legacy/switch-pause.cpp
+++ b/lib/legacy/switch-pause.cpp
@@ -10,7 +10,7 @@

 namespace advss {

-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_pauseAdd_clicked()
 {
@@ -20,7 +20,7 @@ void AdvSceneSwitcher::on_pauseAdd_clicked()
 	listAddClicked(ui->pauseEntries,
 		       new PauseEntryWidget(this,
 					    &switcher->pauseEntries.back()),
-		       &addPulse);
+		       ui->pauseAdd, &addPulse);

 	ui->pauseHelp->setVisible(false);
 }
@@ -264,8 +264,7 @@ void AdvSceneSwitcher::SetupPauseTab()

 	if (switcher->pauseEntries.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->pauseAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->pauseAdd, QColor(Qt::green));
 		}
 		ui->pauseHelp->setVisible(true);
 	} else {
--- a/lib/legacy/switch-random.cpp
+++ b/lib/legacy/switch-random.cpp
@@ -9,7 +9,7 @@
 namespace advss {

 bool RandomSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_randomAdd_clicked()
 {
@@ -19,7 +19,7 @@ void AdvSceneSwitcher::on_randomAdd_clicked()
 	listAddClicked(ui->randomSwitches,
 		       new RandomSwitchWidget(this,
 					      &switcher->randomSwitches.back()),
-		       &addPulse);
+		       ui->randomAdd, &addPulse);

 	ui->randomHelp->setVisible(false);
 }
@@ -131,8 +131,8 @@ void AdvSceneSwitcher::SetupRandomTab()

 	if (switcher->randomSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->randomAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->randomAdd, QColor(Qt::green));
 		}
 		ui->randomHelp->setVisible(true);
 	} else {
@@ -143,12 +143,12 @@ void AdvSceneSwitcher::SetupRandomTab()
 		border-style: outset; \
 		border-width: 2px; \
 		border-radius: 7px; \
-		border-color: rgb(0,0,0) \
+		border-color: rgb(0,0,0,0) \
 		}");
 	if (switcher->switchIfNotMatching != NoMatchBehavior::RANDOM_SWITCH) {
 		if (!switcher->disableHints) {
-			HighlightWidget(ui->randomDisabledWarning,
-					QColor(Qt::red), QColor(0, 0, 0, 0));
+			PulseWidget(ui->randomDisabledWarning, QColor(Qt::red),
+				    QColor(0, 0, 0, 0));
 		}
 	} else {
 		ui->randomDisabledWarning->setVisible(false);
--- a/lib/legacy/switch-screen-region.cpp
+++ b/lib/legacy/switch-screen-region.cpp
@@ -11,7 +11,7 @@
 namespace advss {

 bool ScreenRegionSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::ClearFrames(QListWidget *list)
 {
@@ -79,7 +79,7 @@ void AdvSceneSwitcher::on_screenRegionAdd_clicked()
 	listAddClicked(ui->screenRegionSwitches,
 		       new ScreenRegionWidget(
 			       this, &switcher->screenRegionSwitches.back()),
-		       &addPulse);
+		       ui->screenRegionAdd, &addPulse);

 	ui->regionHelp->setVisible(false);
 }
@@ -248,8 +248,8 @@ void AdvSceneSwitcher::SetupRegionTab()

 	if (switcher->screenRegionSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->screenRegionAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->screenRegionAdd,
+					       QColor(Qt::green));
 		}
 		ui->regionHelp->setVisible(true);
 	} else {
--- a/lib/legacy/switch-sequence.cpp
+++ b/lib/legacy/switch-sequence.cpp
@@ -16,7 +16,7 @@ namespace advss {
 constexpr auto max_extend_text_size = 150;

 bool SceneSequenceSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
 {
@@ -26,7 +26,7 @@ void AdvSceneSwitcher::on_sceneSequenceAdd_clicked()
 	listAddClicked(ui->sceneSequenceSwitches,
 		       new SequenceWidget(
 			       this, &switcher->sceneSequenceSwitches.back()),
-		       &addPulse);
+		       ui->sceneSequenceAdd, &addPulse);

 	ui->sequenceHelp->setVisible(false);
 }
@@ -299,8 +299,8 @@ void AdvSceneSwitcher::SetupSequenceTab()

 	if (switcher->sceneSequenceSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->sceneSequenceAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->sceneSequenceAdd,
+					       QColor(Qt::green));
 		}
 		ui->sequenceHelp->setVisible(true);
 	} else {
@@ -585,8 +585,6 @@ SequenceWidget::SequenceWidget(QWidget *parent, SceneSequenceSwitch *s,
 			    QVariant(QStringLiteral("addIconSmall")));
 	reduce->setProperty("themeID",
 			    QVariant(QStringLiteral("removeIconSmall")));
-	extend->setProperty("class", QVariant(QStringLiteral("icon-plus")));
-	reduce->setProperty("class", QVariant(QStringLiteral("icon-trash")));

 	extend->setMaximumSize(22, 22);
 	reduce->setMaximumSize(22, 22);
--- a/lib/legacy/switch-time.cpp
+++ b/lib/legacy/switch-time.cpp
@@ -7,7 +7,7 @@
 namespace advss {

 bool TimeSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_timeAdd_clicked()
 {
@@ -17,7 +17,7 @@ void AdvSceneSwitcher::on_timeAdd_clicked()
 	listAddClicked(ui->timeSwitches,
 		       new TimeSwitchWidget(this,
 					    &switcher->timeSwitches.back()),
-		       &addPulse);
+		       ui->timeAdd, &addPulse);

 	ui->timeHelp->setVisible(false);
 }
@@ -197,8 +197,7 @@ void AdvSceneSwitcher::SetupTimeTab()

 	if (switcher->timeSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse =
-				HighlightWidget(ui->timeAdd, QColor(Qt::green));
+			addPulse = PulseWidget(ui->timeAdd, QColor(Qt::green));
 		}
 		ui->timeHelp->setVisible(true);
 	} else {
--- a/lib/legacy/switch-video.cpp
+++ b/lib/legacy/switch-video.cpp
@@ -14,7 +14,7 @@
 namespace advss {

 bool VideoSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_videoAdd_clicked()
 {
@@ -24,7 +24,7 @@ void AdvSceneSwitcher::on_videoAdd_clicked()
 	VideoSwitchWidget *sw =
 		new VideoSwitchWidget(this, &switcher->videoSwitches.back());

-	listAddClicked(ui->videoSwitches, sw, &addPulse);
+	listAddClicked(ui->videoSwitches, sw, ui->videoAdd, &addPulse);

 	ui->videoHelp->setVisible(false);
 }
@@ -105,7 +105,7 @@ void AdvSceneSwitcher::on_getScreenshot_clicked()
 	}

 	auto source = obs_weak_source_get_source(s->videoSource);
-	auto screenshotData = std::make_unique<Screenshot>(source);
+	auto screenshotData = std::make_unique<ScreenshotHelper>(source);
 	obs_source_release(source);

 	QString filePath = QFileDialog::getSaveFileName(this);
@@ -121,16 +121,16 @@ void AdvSceneSwitcher::on_getScreenshot_clicked()
 	// During selection of the save path enough time should usually have
 	// passed already
 	// Add this just in case ...
-	if (!screenshotData->IsDone()) {
+	if (!screenshotData->done) {
 		std::this_thread::sleep_for(std::chrono::seconds(1));
 	}

-	if (!screenshotData->IsDone()) {
+	if (!screenshotData->done) {
 		DisplayMessage("Failed to get screenshot of source!");
 		return;
 	}

-	screenshotData->GetImage().save(file.fileName());
+	screenshotData->image.save(file.fileName());
 	sw->SetFilePath(file.fileName());
 }

@@ -202,8 +202,7 @@ void AdvSceneSwitcher::SetupVideoTab()

 	if (switcher->videoSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->videoAdd,
-						   QColor(Qt::green));
+			addPulse = PulseWidget(ui->videoAdd, QColor(Qt::green));
 		}
 		ui->videoHelp->setVisible(true);
 	} else {
@@ -262,7 +261,7 @@ void VideoSwitch::load(obs_data_t *obj)
 void VideoSwitch::getScreenshot()
 {
 	auto source = obs_weak_source_get_source(videoSource);
-	screenshotData = std::make_unique<Screenshot>(source);
+	screenshotData = std::make_unique<ScreenshotHelper>(source);
 	obs_source_release(source);
 }

@@ -293,55 +292,56 @@ bool VideoSwitch::checkMatch()

 	bool match = false;

-	if (!screenshotData) {
-		getScreenshot();
-		return match;
+	if (screenshotData) {
+		if (screenshotData->done) {
+			bool conditionMatch = false;
+
+			switch (condition) {
+			case videoSwitchType::MATCH:
+				conditionMatch = screenshotData->image ==
+						 matchImage;
+				break;
+			case videoSwitchType::DIFFER:
+				conditionMatch = screenshotData->image !=
+						 matchImage;
+				break;
+			case videoSwitchType::HAS_NOT_CHANGED:
+				conditionMatch = screenshotData->image ==
+						 matchImage;
+				break;
+			case videoSwitchType::HAS_CHANGED:
+				conditionMatch = screenshotData->image !=
+						 matchImage;
+				break;
+			default:
+				break;
+			}
+
+			if (conditionMatch) {
+				currentMatchDuration +=
+					std::chrono::duration_cast<
+						std::chrono::milliseconds>(
+						screenshotData->time -
+						previousTime);
+			} else {
+				currentMatchDuration = {};
+			}
+
+			bool durationMatch = currentMatchDuration.count() >=
+					     duration * 1000;
+
+			if (conditionMatch && durationMatch) {
+				match = true;
+			}
+
+			if (!requiresFileInput(condition)) {
+				matchImage = std::move(screenshotData->image);
+			}
+			previousTime = std::move(screenshotData->time);
+
+			screenshotData.reset(nullptr);
+		}
 	}
-	if (!screenshotData->IsDone()) {
-		getScreenshot();
-		return match;
-	}
-
-	bool conditionMatch = false;
-
-	switch (condition) {
-	case videoSwitchType::MATCH:
-		conditionMatch = screenshotData->GetImage() == matchImage;
-		break;
-	case videoSwitchType::DIFFER:
-		conditionMatch = screenshotData->GetImage() != matchImage;
-		break;
-	case videoSwitchType::HAS_NOT_CHANGED:
-		conditionMatch = screenshotData->GetImage() == matchImage;
-		break;
-	case videoSwitchType::HAS_CHANGED:
-		conditionMatch = screenshotData->GetImage() != matchImage;
-		break;
-	default:
-		break;
-	}
-
-	if (conditionMatch) {
-		currentMatchDuration +=
-			std::chrono::duration_cast<std::chrono::milliseconds>(
-				screenshotData->GetScreenshotTime() -
-				previousTime);
-	} else {
-		currentMatchDuration = {};
-	}
-
-	bool durationMatch = currentMatchDuration.count() >= duration * 1000;
-
-	if (conditionMatch && durationMatch) {
-		match = true;
-	}
-
-	if (!requiresFileInput(condition)) {
-		matchImage = screenshotData->GetImage();
-	}
-	previousTime = screenshotData->GetScreenshotTime();
-
-	screenshotData.reset(nullptr);

 	getScreenshot();
 	return match;
--- a/lib/legacy/switch-video.hpp
+++ b/lib/legacy/switch-video.hpp
@@ -32,7 +32,7 @@ struct VideoSwitch : virtual SceneSwitcherEntry {
 	double duration = 0;
 	bool ignoreInactiveSource = false;

-	std::unique_ptr<Screenshot> screenshotData = nullptr;
+	std::unique_ptr<ScreenshotHelper> screenshotData = nullptr;
 	std::chrono::high_resolution_clock::time_point previousTime{};
 	QImage matchImage;

--- a/lib/legacy/switch-window.cpp
+++ b/lib/legacy/switch-window.cpp
@@ -11,7 +11,7 @@
 namespace advss {

 bool WindowSwitch::pause = false;
-static QObject *addPulse = nullptr;
+static QMetaObject::Connection addPulse;

 void AdvSceneSwitcher::on_windowAdd_clicked()
 {
@@ -21,7 +21,7 @@ void AdvSceneSwitcher::on_windowAdd_clicked()
 	listAddClicked(ui->windowSwitches,
 		       new WindowSwitchWidget(this,
 					      &switcher->windowSwitches.back()),
-		       &addPulse);
+		       ui->windowAdd, &addPulse);

 	ui->windowHelp->setVisible(false);
 }
@@ -335,8 +335,8 @@ void AdvSceneSwitcher::SetupTitleTab()

 	if (switcher->windowSwitches.size() == 0) {
 		if (!switcher->disableHints) {
-			addPulse = HighlightWidget(ui->windowAdd,
-						   QColor(Qt::green));
+			addPulse =
+				PulseWidget(ui->windowAdd, QColor(Qt::green));
 		}
 		ui->windowHelp->setVisible(true);
 	} else {
--- a/lib/linux/advanced-scene-switcher-nix.cpp
+++ b/lib/linux/advanced-scene-switcher-nix.cpp
@@ -32,7 +32,6 @@
 #endif
 #include <fstream>
 #include <sstream>
-#include "kwin-helpers.h"

 namespace advss {

@@ -45,10 +44,6 @@ static XScreenSaverAllocInfoFunc allocSSFunc = nullptr;
 static XScreenSaverQueryInfoFunc querySSFunc = nullptr;
 bool canGetIdleTime = false;

-static bool KWin = false;
-static FocusNotifier notifier;
-static QString KWinScriptObjectPath;
-
 static QLibrary *libprocps = nullptr;
 #ifdef PROCPS_AVAILABLE
 typedef PROCTAB *(*openproc_func)(int flags);
@@ -280,11 +275,6 @@ int getActiveWindow(Window *&window)

 void GetCurrentWindowTitle(std::string &title)
 {
-	if (KWin) {
-		title = FocusNotifier::getActiveWindowTitle();
-		return;
-	}
-
 	Window *data = 0;
 	if (getActiveWindow(data) != Success || !data) {
 		return;
@@ -296,7 +286,6 @@ void GetCurrentWindowTitle(std::string &title)

 	auto name = getWindowName(data[0]);
 	XFree(data);
-
 	if (name.empty()) {
 		return;
 	}
@@ -395,11 +384,7 @@ static void getProcessListProcps2(QStringList &processes)
 		return;
 	}
 	while ((stack = procps_pids_get_(info, PIDS_FETCH_TASKS_ONLY))) {
-#ifdef PROCPS2_USE_INFO
 		auto cmd = PIDS_VAL(0, str, stack, info);
-#else
-		auto cmd = PIDS_VAL(0, str, stack);
-#endif
 		QString procName(cmd);
 		if (!procName.isEmpty() && !processes.contains(procName)) {
 			processes << procName;
@@ -423,10 +408,6 @@ void GetProcessList(QStringList &processes)

 long getForegroundProcessPid()
 {
-	if (KWin) {
-		return FocusNotifier::getActiveWindowPID();
-	}
-
 	Window *window;
 	if (getActiveWindow(window) != Success || !window || !*window) {
 		return -1;
@@ -452,7 +433,6 @@ long getForegroundProcessPid()

 	pid = *((long *)prop);
 	XFree(prop);
-
 	return pid;
 }

@@ -566,11 +546,6 @@ static void initProc2()
 #endif
 }

-int ignoreXerror(Display *d, XErrorEvent *e)
-{
-	return 0;
-}
-
 void PlatformInit()
 {
 	auto display = disp();
@@ -578,21 +553,9 @@ void PlatformInit()
 		return;
 	}

-	KWin = isKWinAvailable();
-	if (!(KWin && startKWinScript(KWinScriptObjectPath) &&
-	      registerKWinDBusListener(&notifier))) {
-		// something bad happened while trying to initialize
-		// the KWin script/dbus so disable it
-		KWin = false;
-		blog(LOG_INFO, "not using KWin compat");
-	} else {
-		blog(LOG_INFO, "using KWin compat");
-	}
-
 	initXss();
 	initProcps();
 	initProc2();
-	XSetErrorHandler(ignoreXerror);
 }

 static void cleanupHelper(QLibrary *lib)
@@ -609,9 +572,6 @@ void PlatformCleanup()
 	cleanupHelper(libprocps);
 	cleanupHelper(libproc2);
 	cleanupDisplay();
-	XSetErrorHandler(NULL);
-	if (KWin && !KWinScriptObjectPath.isEmpty())
-		stopKWinScript(KWinScriptObjectPath);
 }

 } // namespace advss
--- a/lib/linux/kwin-helpers.cpp
+++ b/lib/linux/kwin-helpers.cpp
@@ -1,166 +0,0 @@
-#include "kwin-helpers.h"
-
-#include "log-helper.hpp"
-
-#include <QDir>
-#include <QFile>
-#include <QFileDevice>
-#include <QTextStream>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusInterface>
-#include <QtDBus/QDBusReply>
-
-namespace advss {
-
-int FocusNotifier::activePID = -1;
-std::string FocusNotifier::activeTitle = {};
-
-int FocusNotifier::getActiveWindowPID()
-{
-	return activePID;
-}
-
-std::string FocusNotifier::getActiveWindowTitle()
-{
-	return activeTitle;
-}
-
-void FocusNotifier::focusChanged(const int pid)
-{
-	activePID = pid;
-}
-
-void FocusNotifier::focusTitle(const QString &title)
-{
-	activeTitle = title.toStdString();
-}
-
-bool isKWinAvailable()
-{
-	const QDBusConnectionInterface *interface =
-		QDBusConnection::sessionBus().interface();
-	if (!interface)
-		return false;
-
-	const QStringList services =
-		interface->registeredServiceNames().value();
-	return services.contains("org.kde.KWin");
-}
-
-bool startKWinScript(QString &scriptObjectPath)
-{
-	const QString scriptPath =
-		"/tmp/AdvancedSceneSwitcher/KWinFocusNotifier.js";
-
-	const QString script =
-		R"(workspace.windowActivated.connect(function(client) {
-if (!client) return;
-if (!client.pid) return;
-if (!client.caption) return;
-
-callDBus(
-    "com.github.AdvancedSceneSwitcher",
-	"/com/github/AdvancedSceneSwitcher",
-	"com.github.AdvancedSceneSwitcher",
-	"focusChanged",
-	client.pid
-);
-callDBus(
-    "com.github.AdvancedSceneSwitcher",
-	"/com/github/AdvancedSceneSwitcher",
-	"com.github.AdvancedSceneSwitcher",
-	"focusTitle",
-	client.caption
-);
-}))";
-
-	if (const QDir dir; !dir.mkpath(QFileInfo(scriptPath).absolutePath())) {
-		blog(LOG_ERROR, "error creating /tmp/AdvancedSceneSwitcher");
-		return false;
-	}
-
-	QFile scriptFile(scriptPath);
-	if (!scriptFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-		blog(LOG_ERROR,
-		     "error opening KWinFocusNotifier.js for writing");
-		return false;
-	}
-
-	scriptFile.setPermissions(QFileDevice::ReadOwner |
-				  QFileDevice::WriteOwner);
-	QTextStream outputStream(&scriptFile);
-	outputStream << script;
-	scriptFile.close();
-
-	const QDBusConnection bus = QDBusConnection::sessionBus();
-
-	QDBusInterface scriptingIface("org.kde.KWin", "/Scripting",
-				      "org.kde.kwin.Scripting", bus);
-	if (!scriptingIface.isValid()) {
-		return false;
-	}
-
-	const QDBusReply<bool> scriptRunningReply =
-		scriptingIface.call("isScriptLoaded", scriptPath);
-	if (scriptRunningReply.isValid() && scriptRunningReply.value()) {
-		// script already registered and running, don't do it again
-		// this will leave the script running since we do not have
-		// a valid script id anymore, but at the very least this prevents
-		// it from running multiple times
-		return true;
-	}
-
-	const QDBusReply<int> scriptIdReply =
-		scriptingIface.call("loadScript", scriptPath);
-	if (!scriptIdReply.isValid()) {
-		return false;
-	}
-
-	const int scriptId = scriptIdReply.value();
-	scriptObjectPath =
-		QString("/Scripting/Script%1").arg(QString::number(scriptId));
-
-	QDBusInterface scriptRunner("org.kde.KWin", scriptObjectPath,
-				    "org.kde.kwin.Script", bus);
-	if (!scriptRunner.isValid()) {
-		return false;
-	}
-
-	const QDBusReply<void> runReply = scriptRunner.call("run");
-	return runReply.isValid();
-}
-
-bool stopKWinScript(const QString &scriptObjectPath)
-{
-	QDBusInterface scriptRunner("org.kde.KWin", scriptObjectPath,
-				    "org.kde.kwin.Script",
-				    QDBusConnection::sessionBus());
-	if (!scriptRunner.isValid()) {
-		return false;
-	}
-	const QDBusReply<void> stopReply = scriptRunner.call("stop");
-	return stopReply.isValid();
-}
-
-bool registerKWinDBusListener(FocusNotifier *notifier)
-{
-	static const QString serviceName = "com.github.AdvancedSceneSwitcher";
-	static const QString objectPath = "/com/github/AdvancedSceneSwitcher";
-	auto bus = QDBusConnection::sessionBus();
-
-	if (bus.objectRegisteredAt(objectPath)) {
-		// already registered?
-		return true;
-	}
-
-	if (!bus.registerService(serviceName)) {
-		return false;
-	}
-
-	if (!bus.registerObject(objectPath, notifier,
-				QDBusConnection::ExportAllSlots)) {
-		return false;
-	}
-	return true;
-}
-} // namespace advss
--- a/lib/linux/kwin-helpers.h
+++ b/lib/linux/kwin-helpers.h
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <QObject>
-#include <QString>
-#include <string>
-
-namespace advss {
-
-class FocusNotifier final : public QObject {
-	Q_OBJECT
-	Q_CLASSINFO("D-Bus Interface", "com.github.AdvancedSceneSwitcher")
-
-	static int activePID;
-	static std::string activeTitle;
-
-public:
-	using QObject::QObject;
-
-	static int getActiveWindowPID();
-	static std::string getActiveWindowTitle();
-
-public slots:
-	void focusChanged(const int pid);
-	void focusTitle(const QString &title);
-};
-
-bool isKWinAvailable();
-bool startKWinScript(QString &scriptObjectPath);
-bool stopKWinScript(const QString &scriptObjectPath);
-bool registerKWinDBusListener(FocusNotifier *notifier);
-void printDBusError();
-
-} // namespace advss
--- a/lib/macro/macro-action-edit.cpp
+++ b/lib/macro/macro-action-edit.cpp
@@ -1,12 +1,14 @@
 #include "macro-action-edit.hpp"
 #include "advanced-scene-switcher.hpp"
 #include "macro-helpers.hpp"
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "macro.hpp"
 #include "plugin-state-helpers.hpp"
 #include "section.hpp"
 #include "switch-button.hpp"

+#include <QGraphicsOpacityEffect>
+
 namespace advss {

 static inline void populateActionSelection(QComboBox *list)
@@ -15,9 +17,6 @@ static inline void populateActionSelection(QComboBox *list)
 		QString entry(obs_module_text(action._name.c_str()));
 		if (list->findText(entry) == -1) {
 			list->addItem(entry);
-			qobject_cast<QListView *>(list->view())
-				->setRowHidden(list->count() - 1,
-					       action._hidden);
 		} else {
 			blog(LOG_WARNING,
 			     "did not insert duplicate action entry with name \"%s\"",
@@ -30,19 +29,20 @@ static inline void populateActionSelection(QComboBox *list)
 MacroActionEdit::MacroActionEdit(QWidget *parent,
 				 std::shared_ptr<MacroAction> *entryData,
 				 const std::string &id)
-	: MacroSegmentEdit(parent),
+	: MacroSegmentEdit(GetGlobalMacroProperties()._highlightActions,
+			   parent),
 	  _actionSelection(new FilterComboBox()),
 	  _enable(new SwitchButton()),
 	  _entryData(entryData)
 {
-	auto actionStateTimer = new QTimer(this);
-
 	QWidget::connect(_actionSelection,
 			 SIGNAL(currentTextChanged(const QString &)), this,
 			 SLOT(ActionSelectionChanged(const QString &)));
 	QWidget::connect(_enable, SIGNAL(checked(bool)), this,
 			 SLOT(ActionEnableChanged(bool)));
-	QWidget::connect(actionStateTimer, SIGNAL(timeout()), this,
+	QWidget::connect(window(), SIGNAL(HighlightActionsChanged(bool)), this,
+			 SLOT(EnableHighlight(bool)));
+	QWidget::connect(&_actionStateTimer, SIGNAL(timeout()), this,
 			 SLOT(UpdateActionState()));

 	populateActionSelection(_actionSelection);
@@ -63,40 +63,12 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
 	setLayout(mainLayout);

 	_entryData = entryData;
-	SetupWidgets(true);
+	UpdateEntryData(id);

-	actionStateTimer->start(300);
+	_actionStateTimer.start(300);
 	_loading = false;
 }

-void MacroActionEdit::SetupWidgets(bool basicSetup)
-{
-	if (_allWidgetsAreSetup) {
-		return;
-	}
-
-	const auto id = (*_entryData)->GetId();
-	_actionSelection->setCurrentText(
-		obs_module_text(MacroActionFactory::GetActionName(id).c_str()));
-	const bool enabled = (*_entryData)->Enabled();
-	_enable->setChecked(enabled);
-	SetDisableEffect(!enabled);
-	HeaderInfoChanged(
-		QString::fromStdString((*_entryData)->GetShortDesc()));
-
-	if (basicSetup) {
-		return;
-	}
-
-	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
-	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
-			 this, SLOT(HeaderInfoChanged(const QString &)));
-	_section->SetContent(widget, (*_entryData)->GetCollapsed());
-	SetFocusPolicyOfWidgets();
-
-	_allWidgetsAreSetup = true;
-}
-
 void MacroActionEdit::ActionSelectionChanged(const QString &text)
 {
 	if (_loading || !_entryData) {
@@ -126,11 +98,38 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
 	SetFocusPolicyOfWidgets();
 }

+void MacroActionEdit::UpdateEntryData(const std::string &id)
+{
+	_actionSelection->setCurrentText(
+		obs_module_text(MacroActionFactory::GetActionName(id).c_str()));
+	const bool enabled = (*_entryData)->Enabled();
+	_enable->setChecked(enabled);
+	SetDisableEffect(!enabled);
+	auto widget = MacroActionFactory::CreateWidget(id, this, *_entryData);
+	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
+			 this, SLOT(HeaderInfoChanged(const QString &)));
+	HeaderInfoChanged(
+		QString::fromStdString((*_entryData)->GetShortDesc()));
+	_section->SetContent(widget, (*_entryData)->GetCollapsed());
+	SetFocusPolicyOfWidgets();
+}
+
 void MacroActionEdit::SetEntryData(std::shared_ptr<MacroAction> *data)
 {
 	_entryData = data;
 }

+void MacroActionEdit::SetDisableEffect(bool value)
+{
+	if (value) {
+		auto effect = new QGraphicsOpacityEffect(this);
+		effect->setOpacity(0.5);
+		_section->setGraphicsEffect(effect);
+	} else {
+		_section->setGraphicsEffect(nullptr);
+	}
+}
+
 void MacroActionEdit::ActionEnableChanged(bool value)
 {
 	if (_loading || !_entryData) {
@@ -148,9 +147,13 @@ void MacroActionEdit::UpdateActionState()
 		return;
 	}

-	const bool enabled = (*_entryData)->Enabled();
-	SetEnableAppearance(enabled);
-	_enable->setChecked(enabled);
+	SetEnableAppearance((*_entryData)->Enabled());
+}
+
+void MacroActionEdit::SetEnableAppearance(bool value)
+{
+	_enable->setChecked(value);
+	SetDisableEffect(!value);
 }

 std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
@@ -158,34 +161,6 @@ std::shared_ptr<MacroSegment> MacroActionEdit::Data() const
 	return *_entryData;
 }

-void AdvSceneSwitcher::AddMacroAction(Macro *macro, int idx,
-				      const std::string &id, obs_data_t *data)
-{
-	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
-		return;
-	}
-
-	{
-		auto lock = LockContext();
-		macro->Actions().emplace(macro->Actions().begin() + idx,
-					 MacroActionFactory::Create(id, macro));
-		if (data) {
-			macro->Actions().at(idx)->Load(data);
-		}
-		macro->Actions().at(idx)->PostLoad();
-		RunPostLoadSteps();
-		macro->UpdateActionIndices();
-		ui->actionsList->Insert(
-			idx,
-			new MacroActionEdit(this, &macro->Actions()[idx], id));
-		SetActionData(*macro);
-	}
-	HighlightAction(idx);
-	ui->actionsList->SetHelpMsgVisible(false);
-	emit(MacroSegmentOrderChanged());
-}
-
 void AdvSceneSwitcher::AddMacroAction(int idx)
 {
 	auto macro = GetSelectedMacro();
@@ -194,7 +169,6 @@ void AdvSceneSwitcher::AddMacroAction(int idx)
 	}

 	if (idx < 0 || idx > (int)macro->Actions().size()) {
-		assert(false);
 		return;
 	}

@@ -204,13 +178,27 @@ void AdvSceneSwitcher::AddMacroAction(int idx)
 	} else {
 		id = MacroAction::GetDefaultID();
 	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Actions().at(idx - 1)->Save(data);
+	{
+		auto lock = LockContext();
+		macro->Actions().emplace(
+			macro->Actions().begin() + idx,
+			MacroActionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			auto data = obs_data_create();
+			macro->Actions().at(idx - 1)->Save(data);
+			macro->Actions().at(idx)->Load(data);
+			obs_data_release(data);
+		}
+		macro->Actions().at(idx)->PostLoad();
+		RunPostLoadSteps();
+		macro->UpdateActionIndices();
+		ui->actionsList->Insert(
+			idx,
+			new MacroActionEdit(this, &macro->Actions()[idx], id));
+		SetActionData(*macro);
 	}
-	AddMacroAction(macro.get(), idx, id, data);
+	HighlightAction(idx);
+	emit(MacroSegmentOrderChanged());
 }

 void AdvSceneSwitcher::on_actionAdd_clicked()
@@ -228,6 +216,7 @@ void AdvSceneSwitcher::on_actionAdd_clicked()
 	if (currentActionIdx != -1) {
 		MacroActionSelectionChanged(currentActionIdx + 1);
 	}
+	ui->actionsList->SetHelpMsgVisible(false);
 }

 void AdvSceneSwitcher::RemoveMacroAction(int idx)
@@ -322,6 +311,7 @@ void AdvSceneSwitcher::on_elseActionAdd_clicked()
 	if (currentElseActionIdx != -1) {
 		MacroElseActionSelectionChanged(currentElseActionIdx + 1);
 	}
+	ui->elseActionsList->SetHelpMsgVisible(false);
 }

 void AdvSceneSwitcher::on_elseActionRemove_clicked()
@@ -460,21 +450,31 @@ void AdvSceneSwitcher::MacroElseActionReorder(int to, int from)
 	emit(MacroSegmentOrderChanged());
 }

-void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
-					  const std::string &id,
-					  obs_data_t *data)
+void AdvSceneSwitcher::AddMacroElseAction(int idx)
 {
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
+	auto macro = GetSelectedMacro();
+	if (!macro) {
 		return;
 	}

+	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
+		return;
+	}
+
+	std::string id;
+	if (idx - 1 >= 0) {
+		id = macro->ElseActions().at(idx - 1)->GetId();
+	} else {
+		id = MacroAction::GetDefaultID();
+	}
 	{
 		auto lock = LockContext();
-		macro->ElseActions().emplace(macro->ElseActions().begin() + idx,
-					     MacroActionFactory::Create(id,
-									macro));
-		if (data) {
+		macro->ElseActions().emplace(
+			macro->ElseActions().begin() + idx,
+			MacroActionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			OBSDataAutoRelease data = obs_data_create();
+			macro->ElseActions().at(idx - 1)->Save(data);
 			macro->ElseActions().at(idx)->Load(data);
 		}
 		macro->ElseActions().at(idx)->PostLoad();
@@ -486,37 +486,9 @@ void AdvSceneSwitcher::AddMacroElseAction(Macro *macro, int idx,
 		SetElseActionData(*macro);
 	}
 	HighlightElseAction(idx);
-	ui->elseActionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }

-void AdvSceneSwitcher::AddMacroElseAction(int idx)
-{
-	auto macro = GetSelectedMacro();
-	if (!macro) {
-		return;
-	}
-
-	if (idx < 0 || idx > (int)macro->ElseActions().size()) {
-		assert(false);
-		return;
-	}
-
-	std::string id;
-	if (idx - 1 >= 0) {
-		id = macro->ElseActions().at(idx - 1)->GetId();
-	} else {
-		id = MacroAction::GetDefaultID();
-	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->ElseActions().at(idx - 1)->Save(data);
-	}
-	AddMacroElseAction(macro.get(), idx, id, data);
-}
-
 void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
 {
 	auto macro = GetSelectedMacro();
@@ -535,7 +507,7 @@ void AdvSceneSwitcher::RemoveMacroElseAction(int idx)
 		SetMacroAbortWait(true);
 		GetMacroWaitCV().notify_all();
 		macro->UpdateElseActionIndices();
-		SetElseActionData(*macro);
+		SetActionData(*macro);
 	}
 	MacroElseActionSelectionChanged(-1);
 	lastInteracted = MacroSection::ELSE_ACTIONS;
--- a/lib/macro/macro-action-edit.hpp
+++ b/lib/macro/macro-action-edit.hpp
@@ -17,7 +17,7 @@ public:
 		QWidget *parent = nullptr,
 		std::shared_ptr<MacroAction> * = nullptr,
 		const std::string &id = MacroAction::GetDefaultID().data());
-	void SetupWidgets(bool basicSetup = false);
+	void UpdateEntryData(const std::string &id);
 	void SetEntryData(std::shared_ptr<MacroAction> *);

 private slots:
@@ -27,11 +27,14 @@ private slots:

 private:
 	std::shared_ptr<MacroSegment> Data() const;
+	void SetDisableEffect(bool);
+	void SetEnableAppearance(bool);

 	FilterComboBox *_actionSelection;
 	SwitchButton *_enable;

 	std::shared_ptr<MacroAction> *_entryData;
+	QTimer _actionStateTimer;
 	bool _loading = true;
 };

--- a/lib/macro/macro-action-factory.cpp
+++ b/lib/macro/macro-action-factory.cpp
@@ -1,28 +1,7 @@
 #include "macro-action-factory.hpp"

-#include <mutex>
-
 namespace advss {

-namespace {
-
-class MacroActionUnknown : public MacroAction {
-public:
-	MacroActionUnknown(Macro *m) : MacroAction(m) {}
-	std::shared_ptr<MacroAction> Copy() const
-	{
-		return std::make_shared<MacroActionUnknown>(GetMacro());
-	}
-	bool PerformAction() { return true; };
-	bool Save(obs_data_t *obj) const { return MacroAction::Save(obj); };
-	bool Load(obs_data_t *obj) { return MacroAction::Load(obj); };
-	std::string GetId() const { return "unknown"; }
-};
-
-} // namespace
-
-static std::recursive_mutex mutex;
-
 std::map<std::string, MacroActionInfo> &MacroActionFactory::GetMap()
 {
 	static std::map<std::string, MacroActionInfo> _methods;
@@ -31,7 +10,6 @@ std::map<std::string, MacroActionInfo> &MacroActionFactory::GetMap()

 bool MacroActionFactory::Register(const std::string &id, MacroActionInfo info)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it == GetMap().end()) {
 		GetMap()[id] = info;
 		return true;
@@ -39,61 +17,35 @@ bool MacroActionFactory::Register(const std::string &id, MacroActionInfo info)
 	return false;
 }

-bool MacroActionFactory::Deregister(const std::string &id)
-{
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (GetMap().count(id) == 0) {
-		return false;
-	}
-	GetMap().erase(id);
-	return true;
-}
-
-static std::shared_ptr<MacroAction> createUnknownAction(Macro *m)
-{
-	return std::make_shared<MacroActionUnknown>(m);
-}
-
 std::shared_ptr<MacroAction> MacroActionFactory::Create(const std::string &id,
 							Macro *m)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (auto it = GetMap().find(id); it != GetMap().end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end())
 		return it->second._create(m);
-	}

-	return createUnknownAction(m);
-}
-
-static QWidget *createUnknownActionWidget()
-{
-	return new QLabel(obs_module_text("AdvSceneSwitcher.action.unknown"));
+	return nullptr;
 }

 QWidget *MacroActionFactory::CreateWidget(const std::string &id,
 					  QWidget *parent,
 					  std::shared_ptr<MacroAction> action)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (auto it = GetMap().find(id); it != GetMap().end()) {
+	if (auto it = GetMap().find(id); it != GetMap().end())
 		return it->second._createWidget(parent, action);
-	}

-	return createUnknownActionWidget();
+	return nullptr;
 }

 std::string MacroActionFactory::GetActionName(const std::string &id)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._name;
 	}
-	return obs_module_text("AdvSceneSwitcher.action.unknown");
+	return "unknown action";
 }

 std::string MacroActionFactory::GetIdByName(const QString &name)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	for (auto it : GetMap()) {
 		if (name == obs_module_text(it.second._name.c_str())) {
 			return it.first;
@@ -102,14 +54,4 @@ std::string MacroActionFactory::GetIdByName(const QString &name)
 	return "";
 }

-bool CanCreateDefaultAction()
-{
-	const auto action = MacroActionFactory::Create(
-		MacroAction::GetDefaultID().data(), nullptr);
-	if (!action) {
-		return false;
-	}
-	return action->GetId() == MacroAction::GetDefaultID().data();
-}
-
 } // namespace advss
--- a/lib/macro/macro-action-factory.hpp
+++ b/lib/macro/macro-action-factory.hpp
@@ -6,13 +6,12 @@
 namespace advss {

 struct MacroActionInfo {
+	using CreateAction = std::shared_ptr<MacroAction> (*)(Macro *m);
 	using CreateActionWidget = QWidget *(*)(QWidget *parent,
 						std::shared_ptr<MacroAction>);
-
-	std::function<std::shared_ptr<MacroAction>(Macro *m)> _create = nullptr;
+	CreateAction _create = nullptr;
 	CreateActionWidget _createWidget = nullptr;
 	std::string _name;
-	bool _hidden = false;
 };

 class MacroActionFactory {
@@ -20,7 +19,6 @@ public:
 	MacroActionFactory() = delete;

 	EXPORT static bool Register(const std::string &id, MacroActionInfo);
-	EXPORT static bool Deregister(const std::string &id);
 	static std::shared_ptr<MacroAction> Create(const std::string &id,
 						   Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
@@ -33,6 +31,4 @@ private:
 	static std::map<std::string, MacroActionInfo> &GetMap();
 };

-bool CanCreateDefaultAction();
-
 } // namespace advss
--- a/lib/macro/macro-action-macro.cpp
+++ b/lib/macro/macro-action-macro.cpp
@@ -1,5 +1,4 @@
 #include "macro-action-macro.hpp"
-#include "help-icon.hpp"
 #include "layout-helpers.hpp"
 #include "macro.hpp"

@@ -12,6 +11,25 @@ bool MacroActionMacro::_registered = MacroActionFactory::Register(
 	{MacroActionMacro::Create, MacroActionMacroEdit::Create,
 	 "AdvSceneSwitcher.action.macro"});

+const static std::map<MacroActionMacro::Action, std::string> actionTypes = {
+	{MacroActionMacro::Action::PAUSE,
+	 "AdvSceneSwitcher.action.macro.type.pause"},
+	{MacroActionMacro::Action::UNPAUSE,
+	 "AdvSceneSwitcher.action.macro.type.unpause"},
+	{MacroActionMacro::Action::RESET_COUNTER,
+	 "AdvSceneSwitcher.action.macro.type.resetCounter"},
+	{MacroActionMacro::Action::RUN,
+	 "AdvSceneSwitcher.action.macro.type.run"},
+	{MacroActionMacro::Action::STOP,
+	 "AdvSceneSwitcher.action.macro.type.stop"},
+	{MacroActionMacro::Action::DISABLE_ACTION,
+	 "AdvSceneSwitcher.action.macro.type.disableAction"},
+	{MacroActionMacro::Action::ENABLE_ACTION,
+	 "AdvSceneSwitcher.action.macro.type.enableAction"},
+	{MacroActionMacro::Action::TOGGLE_ACTION,
+	 "AdvSceneSwitcher.action.macro.type.toggleAction"},
+};
+
 bool MacroActionMacro::PerformAction()
 {
 	auto macro = _macro.GetMacro();
@@ -26,14 +44,13 @@ bool MacroActionMacro::PerformAction()
 	case Action::UNPAUSE:
 		macro->SetPaused(false);
 		break;
-	case Action::TOGGLE_PAUSE:
-		macro->SetPaused(!macro->Paused());
-		break;
 	case Action::RESET_COUNTER:
 		macro->ResetRunCount();
 		break;
 	case Action::RUN:
-		RunActions(macro.get());
+		if (!macro->Paused()) {
+			macro->PerformActions(true, false, true);
+		}
 		break;
 	case Action::STOP:
 		macro->Stop();
@@ -110,7 +127,6 @@ bool MacroActionMacro::Save(obs_data_t *obj) const
 	_macro.Save(obj);
 	_actionIndex.Save(obj, "actionIndex");
 	obs_data_set_int(obj, "action", static_cast<int>(_action));
-	_runOptions.Save(obj);
 	return true;
 }

@@ -121,15 +137,6 @@ bool MacroActionMacro::Load(obs_data_t *obj)
 	_actionIndex.Load(obj, "actionIndex");
 	_action = static_cast<MacroActionMacro::Action>(
 		obs_data_get_int(obj, "action"));
-	_runOptions.Load(obj);
-	return true;
-}
-
-bool MacroActionMacro::PostLoad()
-{
-	MacroRefAction::PostLoad();
-	MacroAction::PostLoad();
-	_runOptions.macro.PostLoad();
 	return true;
 }

@@ -153,91 +160,11 @@ void MacroActionMacro::ResolveVariablesToFixedValues()
 	_actionIndex.ResolveVariables();
 }

-static void runActionsHelper(Macro *macro, bool runElseActions, bool setInputs,
-			     const StringList &inputs)
+static inline void populateActionSelection(QComboBox *list)
 {
-	if (setInputs) {
-		macro->GetInputVariables().SetValues(inputs);
+	for (auto entry : actionTypes) {
+		list->addItem(obs_module_text(entry.second.c_str()));
 	}
-	macro->PerformActions(!runElseActions, false, true);
-}
-
-void MacroActionMacro::RunActions(Macro *actionMacro) const
-{
-	if (_runOptions.skipWhenPaused && actionMacro->Paused()) {
-		return;
-	}
-
-	if (_runOptions.logic == RunOptions::Logic::IGNORE_CONDITIONS) {
-		runActionsHelper(actionMacro, _runOptions.runElseActions,
-				 _runOptions.setInputs, _runOptions.inputs);
-		return;
-	}
-
-	auto conditionMacro = _runOptions.macro.GetMacro();
-	if (!conditionMacro) {
-		return;
-	}
-
-	if (_runOptions.reevaluateConditionState) {
-		conditionMacro->CheckConditions(true);
-	}
-
-	if ((_runOptions.logic == RunOptions::Logic::CONDITIONS &&
-	     conditionMacro->ConditionsMatched()) ||
-	    (_runOptions.logic == RunOptions::Logic::INVERT_CONDITIONS &&
-	     !conditionMacro->ConditionsMatched())) {
-		runActionsHelper(actionMacro, _runOptions.runElseActions,
-				 _runOptions.setInputs, _runOptions.inputs);
-	}
-}
-
-static void populateActionSelection(QComboBox *list)
-{
-	static const std::vector<std::pair<MacroActionMacro::Action, std::string>>
-		actions = {
-			{MacroActionMacro::Action::PAUSE,
-			 "AdvSceneSwitcher.action.macro.type.pause"},
-			{MacroActionMacro::Action::UNPAUSE,
-			 "AdvSceneSwitcher.action.macro.type.unpause"},
-			{MacroActionMacro::Action::TOGGLE_PAUSE,
-			 "AdvSceneSwitcher.action.macro.type.togglePause"},
-			{MacroActionMacro::Action::RESET_COUNTER,
-			 "AdvSceneSwitcher.action.macro.type.resetCounter"},
-			{MacroActionMacro::Action::RUN,
-			 "AdvSceneSwitcher.action.macro.type.run"},
-			{MacroActionMacro::Action::STOP,
-			 "AdvSceneSwitcher.action.macro.type.stop"},
-			{MacroActionMacro::Action::DISABLE_ACTION,
-			 "AdvSceneSwitcher.action.macro.type.disableAction"},
-			{MacroActionMacro::Action::ENABLE_ACTION,
-			 "AdvSceneSwitcher.action.macro.type.enableAction"},
-			{MacroActionMacro::Action::TOGGLE_ACTION,
-			 "AdvSceneSwitcher.action.macro.type.toggleAction"},
-		};
-
-	for (const auto &[value, name] : actions) {
-		list->addItem(obs_module_text(name.c_str()),
-			      static_cast<int>(value));
-	}
-}
-
-static void populateConditionBehaviorSelection(QComboBox *list)
-{
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.ignore"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.true"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.conditions.false"));
-}
-
-static void populateActionTypeSelection(QComboBox *list)
-{
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.actionType.regular"));
-	list->addItem(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.actionType.else"));
 }

 MacroActionMacroEdit::MacroActionMacroEdit(
@@ -246,28 +173,9 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	  _macros(new MacroSelection(parent)),
 	  _actionIndex(new MacroSegmentSelection(
 		  this, MacroSegmentSelection::Type::ACTION)),
-	  _actions(new QComboBox()),
-	  _conditionMacros(new MacroSelection(parent)),
-	  _conditionBehaviors(new QComboBox()),
-	  _reevaluateConditionState(new QCheckBox(
-		  obs_module_text("AdvSceneSwitcher.action.macro.type.run."
-				  "updateConditionMatchState"))),
-	  _actionTypes(new QComboBox()),
-	  _skipWhenPaused(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.macro.type.run.skipWhenPaused"))),
-	  _setInputs(new QCheckBox(obs_module_text(
-		  "AdvSceneSwitcher.action.macro.type.run.setInputs"))),
-	  _inputs(new MacroInputEdit()),
-	  _entryLayout(new QHBoxLayout()),
-	  _conditionLayout(new QHBoxLayout()),
-	  _reevaluateConditionStateLayout(new QHBoxLayout()),
-	  _setInputsLayout(new QHBoxLayout())
+	  _actions(new QComboBox())
 {
 	populateActionSelection(_actions);
-	populateConditionBehaviorSelection(_conditionBehaviors);
-	populateActionTypeSelection(_actionTypes);
-
-	_conditionMacros->HideSelectedMacro();

 	QWidget::connect(_macros, SIGNAL(currentTextChanged(const QString &)),
 			 this, SLOT(MacroChanged(const QString &)));
@@ -276,190 +184,68 @@ MacroActionMacroEdit::MacroActionMacroEdit(
 	QWidget::connect(_actionIndex,
 			 SIGNAL(SelectionChanged(const IntVariable &)), this,
 			 SLOT(ActionIndexChanged(const IntVariable &)));
-	QWidget::connect(_conditionMacros,
-			 SIGNAL(currentTextChanged(const QString &)), this,
-			 SLOT(ConditionMacroChanged(const QString &)));
-	QWidget::connect(_conditionBehaviors, SIGNAL(currentIndexChanged(int)),
-			 this, SLOT(ConditionBehaviorChanged(int)));
-	QWidget::connect(_actionTypes, SIGNAL(currentIndexChanged(int)), this,
-			 SLOT(ActionTypeChanged(int)));
-	QWidget::connect(_skipWhenPaused, SIGNAL(stateChanged(int)), this,
-			 SLOT(SkipWhenPausedChanged(int)));
-	QWidget::connect(_setInputs, SIGNAL(stateChanged(int)), this,
-			 SLOT(SetInputsChanged(int)));
-	QWidget::connect(_inputs,
-			 SIGNAL(MacroInputValuesChanged(const StringList &)),
-			 this, SLOT(InputsChanged(const StringList &)));
-	QWidget::connect(_reevaluateConditionState, SIGNAL(stateChanged(int)),
-			 this, SLOT(ReevaluateConditionStateChanged(int)));

-	_setInputsLayout->addWidget(_setInputs);
-	_setInputsLayout->addWidget(new HelpIcon(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.setInputs.description")));
-	_setInputsLayout->addStretch();
+	auto mainLayout = new QHBoxLayout;
+	PlaceWidgets(obs_module_text("AdvSceneSwitcher.action.macro.entry"),
+		     mainLayout,
+		     {{"{{actions}}", _actions},
+		      {"{{actionIndex}}", _actionIndex},
+		      {"{{macros}}", _macros}});
+	setLayout(mainLayout);

-	_reevaluateConditionStateLayout->addWidget(_reevaluateConditionState);
-	_reevaluateConditionStateLayout->addWidget(new HelpIcon(obs_module_text(
-		"AdvSceneSwitcher.action.macro.type.run.updateConditionMatchState.help")));
-	_reevaluateConditionStateLayout->addStretch();
-
-	auto layout = new QVBoxLayout();
-	layout->addLayout(_entryLayout);
-	layout->addLayout(_conditionLayout);
-	layout->addLayout(_reevaluateConditionStateLayout);
-	layout->addLayout(_setInputsLayout);
-	layout->addWidget(_inputs);
-	layout->addWidget(_skipWhenPaused);
-	setLayout(layout);
 	_entryData = entryData;
 	UpdateEntryData();
 	_loading = false;
 }

-void HighlightMacroSettingsButton(bool enable);
-
-MacroActionMacroEdit::~MacroActionMacroEdit()
-{
-	HighlightMacroSettingsButton(false);
-}
-
 void MacroActionMacroEdit::UpdateEntryData()
 {
 	if (!_entryData) {
 		return;
 	}
-	_actions->setCurrentIndex(
-		_actions->findData(static_cast<int>(_entryData->_action)));
+	_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
 	_actionIndex->SetValue(_entryData->_actionIndex);
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	_macros->SetCurrentMacro(_entryData->_macro);
-	_conditionMacros->SetCurrentMacro(_entryData->_runOptions.macro);
-	_conditionBehaviors->setCurrentIndex(
-		static_cast<int>(_entryData->_runOptions.logic));
-	_reevaluateConditionState->setChecked(
-		_entryData->_runOptions.reevaluateConditionState);
-	_actionTypes->setCurrentIndex(
-		_entryData->_runOptions.runElseActions ? 1 : 0);
-	_skipWhenPaused->setChecked(_entryData->_runOptions.skipWhenPaused);
-	_setInputs->setChecked(_entryData->_runOptions.setInputs);
-	SetupMacroInput(_entryData->_macro.GetMacro().get());
 	SetWidgetVisibility();
 }

 void MacroActionMacroEdit::MacroChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_macro = text;
-	const auto &macro = _entryData->_macro.GetMacro();
-	_actionIndex->SetMacro(macro);
-	SetupMacroInput(macro.get());
+	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
-	SetWidgetVisibility();
 }

-void MacroActionMacroEdit::ActionChanged(int idx)
+void MacroActionMacroEdit::ActionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_action = static_cast<MacroActionMacro::Action>(
-		_actions->itemData(idx).toInt());
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
+	_entryData->_action = static_cast<MacroActionMacro::Action>(value);
 	SetWidgetVisibility();
 }

 void MacroActionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_actionIndex = value;
 }

-void MacroActionMacroEdit::ConditionMacroChanged(const QString &text)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.macro = text;
-}
-
-void MacroActionMacroEdit::ConditionBehaviorChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.logic =
-		static_cast<MacroActionMacro::RunOptions::Logic>(value);
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::ReevaluateConditionStateChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.reevaluateConditionState = value;
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::ActionTypeChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.runElseActions = value;
-}
-
-void MacroActionMacroEdit::SkipWhenPausedChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.skipWhenPaused = value;
-}
-
-void MacroActionMacroEdit::SetInputsChanged(int value)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.setInputs = value;
-	SetWidgetVisibility();
-}
-
-void MacroActionMacroEdit::InputsChanged(const StringList &inputs)
-{
-	GUARD_LOADING_AND_LOCK();
-	_entryData->_runOptions.inputs = inputs;
-	adjustSize();
-	updateGeometry();
-}
-
 void MacroActionMacroEdit::SetWidgetVisibility()
 {
-	_entryLayout->removeWidget(_actions);
-	_entryLayout->removeWidget(_actionIndex);
-	_entryLayout->removeWidget(_macros);
-	_entryLayout->removeWidget(_actionTypes);
-	_conditionLayout->removeWidget(_conditionBehaviors);
-	_conditionLayout->removeWidget(_conditionMacros);
-
-	ClearLayout(_entryLayout);
-	ClearLayout(_conditionLayout);
-
-	const std::unordered_map<std::string, QWidget *> placeholders = {
-		{"{{actions}}", _actions},
-		{"{{actionIndex}}", _actionIndex},
-		{"{{macros}}", _macros},
-		{"{{actionTypes}}", _actionTypes},
-		{"{{conditionBehaviors}}", _conditionBehaviors},
-		{"{{conditionMacros}}", _conditionMacros},
-
-	};
-
-	PlaceWidgets(
-		obs_module_text(
-			_entryData->_action == MacroActionMacro::Action::RUN
-				? "AdvSceneSwitcher.action.macro.entry.run"
-				: "AdvSceneSwitcher.action.macro.entry.other"),
-		_entryLayout, placeholders);
-
-	if (_entryData->_runOptions.logic ==
-	    MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS) {
-		_conditionLayout->addWidget(_conditionBehaviors);
-		_conditionLayout->addStretch();
-	} else {
-		PlaceWidgets(
-			obs_module_text(
-				"AdvSceneSwitcher.action.macro.entry.run.condition"),
-			_conditionLayout, placeholders);
-	}
-
 	if (_entryData->_action == MacroActionMacro::Action::RUN ||
 	    _entryData->_action == MacroActionMacro::Action::STOP) {
 		_macros->HideSelectedMacro();
@@ -474,73 +260,6 @@ void MacroActionMacroEdit::SetWidgetVisibility()
 			MacroActionMacro::Action::ENABLE_ACTION ||
 		_entryData->_action == MacroActionMacro::Action::TOGGLE_ACTION;
 	_actionIndex->setVisible(isModifyingActionState);
-
-	SetLayoutVisible(_conditionLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
-	const bool needsAdditionalConditionWidgets =
-		_entryData->_action == MacroActionMacro::Action::RUN &&
-		_entryData->_runOptions.logic !=
-			MacroActionMacro::RunOptions::Logic::IGNORE_CONDITIONS;
-	_conditionMacros->setVisible(needsAdditionalConditionWidgets);
-	SetLayoutVisible(_reevaluateConditionStateLayout,
-			 needsAdditionalConditionWidgets);
-	SetLayoutVisible(_setInputsLayout,
-			 _entryData->_action == MacroActionMacro::Action::RUN);
-	_inputs->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN &&
-			    _entryData->_runOptions.setInputs);
-	HighlightMacroSettingsButton(_entryData->_action ==
-					     MacroActionMacro::Action::RUN &&
-				     _entryData->_runOptions.setInputs &&
-				     !_inputs->HasInputsToSet());
-	_actionTypes->setVisible(_entryData->_action ==
-				 MacroActionMacro::Action::RUN);
-	_skipWhenPaused->setVisible(_entryData->_action ==
-				    MacroActionMacro::Action::RUN);
-
-	adjustSize();
-	updateGeometry();
-}
-
-void MacroActionMacroEdit::SetupMacroInput(Macro *macro) const
-{
-	if (macro) {
-		_inputs->SetInputVariablesAndValues(
-			macro->GetInputVariables(),
-			_entryData->_runOptions.inputs);
-	} else {
-		_inputs->SetInputVariablesAndValues({}, {});
-	}
-}
-
-void MacroActionMacro::RunOptions::Save(obs_data_t *obj) const
-{
-	OBSDataAutoRelease data = obs_data_create();
-	obs_data_set_int(data, "logic", static_cast<int>(logic));
-	obs_data_set_bool(data, "reevaluateConditionState",
-			  reevaluateConditionState);
-	obs_data_set_bool(data, "runElseActions", runElseActions);
-	obs_data_set_bool(data, "skipWhenPaused", skipWhenPaused);
-	obs_data_set_bool(data, "setInputs", setInputs);
-	inputs.Save(data, "inputs");
-	macro.Save(data);
-	obs_data_set_obj(obj, "runOptions", data);
-}
-
-void MacroActionMacro::RunOptions::Load(obs_data_t *obj)
-{
-	if (!obs_data_has_user_value(obj, "runOptions")) {
-		return;
-	}
-	OBSDataAutoRelease data = obs_data_get_obj(obj, "runOptions");
-	logic = static_cast<Logic>(obs_data_get_int(data, "logic"));
-	reevaluateConditionState =
-		obs_data_get_bool(data, "reevaluateConditionState");
-	runElseActions = obs_data_get_bool(data, "runElseActions");
-	skipWhenPaused = obs_data_get_bool(data, "skipWhenPaused");
-	setInputs = obs_data_get_bool(data, "setInputs");
-	inputs.Load(data, "inputs");
-	macro.Load(data);
 }

 } // namespace advss
--- a/lib/macro/macro-action-macro.hpp
+++ b/lib/macro/macro-action-macro.hpp
@@ -1,45 +1,25 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "macro-input.hpp"
 #include "macro-selection.hpp"
 #include "macro-segment-selection.hpp"

-#include <QCheckBox>
 #include <QHBoxLayout>

 namespace advss {

-class MacroActionMacro final : public MacroRefAction {
+class MacroActionMacro : public MacroRefAction {
 public:
 	MacroActionMacro(Macro *m) : MacroAction(m), MacroRefAction(m) {}
 	bool PerformAction();
 	void LogAction() const;
 	bool Save(obs_data_t *obj) const;
 	bool Load(obs_data_t *obj);
-	bool PostLoad();
 	std::string GetShortDesc() const;
 	std::string GetId() const { return id; };
 	static std::shared_ptr<MacroAction> Create(Macro *m);
 	std::shared_ptr<MacroAction> Copy() const;
 	void ResolveVariablesToFixedValues();

-	struct RunOptions {
-		void Save(obs_data_t *obj) const;
-		void Load(obs_data_t *obj);
-		enum class Logic {
-			IGNORE_CONDITIONS,
-			CONDITIONS,
-			INVERT_CONDITIONS,
-		};
-		Logic logic;
-		bool reevaluateConditionState = false;
-		bool runElseActions = false;
-		bool skipWhenPaused = true;
-		bool setInputs = false;
-		StringList inputs;
-		MacroRef macro;
-	};
-
 	enum class Action {
 		PAUSE,
 		UNPAUSE,
@@ -49,27 +29,22 @@ public:
 		DISABLE_ACTION,
 		ENABLE_ACTION,
 		TOGGLE_ACTION,
-		TOGGLE_PAUSE,
 	};
-	Action _action = Action::RUN;
+	Action _action = Action::PAUSE;
 	IntVariable _actionIndex = 1;
-	RunOptions _runOptions = {};

 private:
-	void RunActions(Macro *actionMacro) const;
-
 	static bool _registered;
 	static const std::string id;
 };

-class MacroActionMacroEdit final : public QWidget {
+class MacroActionMacroEdit : public QWidget {
 	Q_OBJECT

 public:
 	MacroActionMacroEdit(
 		QWidget *parent,
 		std::shared_ptr<MacroActionMacro> entryData = nullptr);
-	~MacroActionMacroEdit();
 	void UpdateEntryData();
 	static QWidget *Create(QWidget *parent,
 			       std::shared_ptr<MacroAction> action)
@@ -83,37 +58,18 @@ private slots:
 	void MacroChanged(const QString &text);
 	void ActionChanged(int value);
 	void ActionIndexChanged(const IntVariable &value);
-	void ConditionMacroChanged(const QString &text);
-	void ConditionBehaviorChanged(int value);
-	void ReevaluateConditionStateChanged(int value);
-	void ActionTypeChanged(int value);
-	void SkipWhenPausedChanged(int value);
-	void SetInputsChanged(int value);
-	void InputsChanged(const StringList &);
-
 signals:
 	void HeaderInfoChanged(const QString &);

-private:
-	void SetWidgetVisibility();
-	void SetupMacroInput(Macro *) const;
-
+protected:
 	MacroSelection *_macros;
 	MacroSegmentSelection *_actionIndex;
 	QComboBox *_actions;
-	MacroSelection *_conditionMacros;
-	QComboBox *_conditionBehaviors;
-	QCheckBox *_reevaluateConditionState;
-	QComboBox *_actionTypes;
-	QCheckBox *_skipWhenPaused;
-	QCheckBox *_setInputs;
-	MacroInputEdit *_inputs;
-	QHBoxLayout *_entryLayout;
-	QHBoxLayout *_conditionLayout;
-	QHBoxLayout *_reevaluateConditionStateLayout;
-	QHBoxLayout *_setInputsLayout;
-
 	std::shared_ptr<MacroActionMacro> _entryData;
+
+private:
+	void SetWidgetVisibility();
+
 	bool _loading = true;
 };

--- a/lib/macro/macro-action-queue.cpp
+++ b/lib/macro/macro-action-queue.cpp
@@ -170,7 +170,11 @@ void MacroActionQueueEdit::UpdateEntryData()

 void MacroActionQueueEdit::MacroChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -178,7 +182,11 @@ void MacroActionQueueEdit::MacroChanged(const QString &text)

 void MacroActionQueueEdit::QueueChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_queue = GetWeakActionQueueByQString(text);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -186,7 +194,11 @@ void MacroActionQueueEdit::QueueChanged(const QString &text)

 void MacroActionQueueEdit::ActionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_action = static_cast<MacroActionQueue::Action>(value);
 	SetWidgetVisibility();
 	emit HeaderInfoChanged(
--- a/lib/macro/macro-action-variable.cpp
+++ b/lib/macro/macro-action-variable.cpp
--- a/lib/macro/macro-action-variable.hpp
+++ b/lib/macro/macro-action-variable.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "macro-action-edit.hpp"
-#include "help-icon.hpp"
 #include "macro-segment-selection.hpp"
 #include "regex-config.hpp"
 #include "resizing-text-edit.hpp"
@@ -28,8 +27,8 @@ public:
 	int GetSegmentIndexValue() const;
 	void ResolveVariablesToFixedValues();

-	enum class Action {
-		SET_VALUE,
+	enum class Type {
+		SET_FIXED_VALUE,
 		APPEND,
 		APPEND_VAR,
 		INCREMENT,
@@ -49,24 +48,18 @@ public:
 		SCENE_ITEM_NAME,
 		PAD,
 		TRUNCATE,
-		SWAP_VALUES,
-		TRIM,
-		CHANGE_CASE,
-		RANDOM_NUMBER,
-		QUERY_JSON,
-		ARRAY_JSON,
 	};

-	Action _action = Action::SET_VALUE;
+	Type _type = Type::SET_FIXED_VALUE;
 	std::weak_ptr<Variable> _variable;
 	std::weak_ptr<Variable> _variable2;
 	StringVariable _strValue = "";
-	DoubleVariable _numValue = 0;
-	IntVariable _subStringStart = 0;
-	IntVariable _subStringSize = 0;
+	double _numValue = 0;
+	int _subStringStart = 0;
+	int _subStringSize = 0;
 	RegexConfig _subStringRegex = RegexConfig::PartialMatchRegexConfig();
 	std::string _regexPattern = ".*";
-	IntVariable _regexMatchIdx = 0;
+	int _regexMatchIdx = 0;
 	RegexConfig _findRegex;
 	StringVariable _findStr = obs_module_text(
 		"AdvSceneSwitcher.action.variable.findAndReplace.find");
@@ -94,30 +87,13 @@ public:
 	IntVariable _stringLength = 1;
 	char _paddingChar = '0';

-	enum class CaseType {
-		LOWER_CASE,
-		UPPER_CASE,
-		CAPITALIZED,
-		START_CASE,
-	};
-
-	CaseType _caseType = CaseType::LOWER_CASE;
-	DoubleVariable _randomNumberStart = 0;
-	DoubleVariable _randomNumberEnd = 100;
-	bool _generateInteger = true;
-
-	StringVariable _jsonQuery = "$.some.nested.value";
-	IntVariable _jsonIndex = 0;
-
 private:
 	void DecrementCurrentSegmentVariableRef();
 	void HandleIndexSubString(Variable *);
 	void HandleRegexSubString(Variable *);
 	void HandleFindAndReplace(Variable *);
 	void HandleMathExpression(Variable *);
-	void HandleCaseChange(Variable *);
 	void SetToSceneItemName(Variable *);
-	void GenerateRandomNumber(Variable *);

 	std::weak_ptr<MacroSegment> _macroSegment;
 	int _segmentIdxLoadValue = -1;
@@ -146,15 +122,15 @@ private slots:
 	void Variable2Changed(const QString &);
 	void ActionChanged(int);
 	void StrValueChanged();
-	void NumValueChanged(const NumberVariable<double> &value);
+	void NumValueChanged(double);
 	void SegmentIndexChanged(const IntVariable &);
 	void UpdateSegmentVariableValue();
 	void MacroSegmentOrderChanged();
-	void SubStringStartChanged(const NumberVariable<int> &start);
-	void SubStringSizeChanged(const NumberVariable<int> &size);
+	void SubStringStartChanged(int val);
+	void SubStringSizeChanged(int val);
 	void SubStringRegexChanged(const RegexConfig &conf);
 	void RegexPatternChanged();
-	void RegexMatchIdxChanged(const NumberVariable<int> &index);
+	void RegexMatchIdxChanged(int val);
 	void FindStrValueChanged();
 	void FindRegexChanged(const RegexConfig &conf);
 	void ReplaceStrValueChanged();
@@ -170,12 +146,6 @@ private slots:
 	void DirectionChanged(int);
 	void StringLengthChanged(const NumberVariable<int> &);
 	void CharSelectionChanged(const QString &);
-	void CaseTypeChanged(int index);
-	void RandomNumberStartChanged(const NumberVariable<double> &);
-	void RandomNumberEndChanged(const NumberVariable<double> &);
-	void GenerateIntegerChanged(int);
-	void JsonQueryChanged();
-	void JsonIndexChanged(const NumberVariable<int> &);

 signals:
 	void HeaderInfoChanged(const QString &);
@@ -188,18 +158,18 @@ private:
 	VariableSelection *_variables2;
 	FilterComboBox *_actions;
 	VariableTextEdit *_strValue;
-	VariableDoubleSpinBox *_numValue;
+	QDoubleSpinBox *_numValue;
 	MacroSegmentSelection *_segmentIdx;
 	QLabel *_segmentValueStatus;
 	ResizingPlainTextEdit *_segmentValue;
 	QVBoxLayout *_substringLayout;
 	QHBoxLayout *_subStringIndexEntryLayout;
 	QHBoxLayout *_subStringRegexEntryLayout;
-	VariableSpinBox *_subStringStart;
-	VariableSpinBox *_subStringSize;
+	QSpinBox *_subStringStart;
+	QSpinBox *_subStringSize;
 	RegexConfigWidget *_substringRegex;
 	ResizingPlainTextEdit *_regexPattern;
-	VariableSpinBox *_regexMatchIdx;
+	QSpinBox *_regexMatchIdx;
 	QHBoxLayout *_findReplaceLayout;
 	RegexConfigWidget *_findRegex;
 	VariableTextEdit *_findStr;
@@ -215,19 +185,10 @@ private:
 	VariableLineEdit *_envVariable;
 	SceneSelectionWidget *_scenes;
 	TempVariableSelection *_tempVars;
-	HelpIcon *_tempVarsHelp;
 	VariableSpinBox *_sceneItemIndex;
 	QComboBox *_direction;
 	VariableSpinBox *_stringLength;
 	SingleCharSelection *_paddingCharSelection;
-	FilterComboBox *_caseType;
-	VariableDoubleSpinBox *_randomNumberStart;
-	VariableDoubleSpinBox *_randomNumberEnd;
-	QCheckBox *_generateInteger;
-	QVBoxLayout *_randomLayout;
-	VariableLineEdit *_jsonQuery;
-	QLabel *_jsonQueryHelp;
-	VariableSpinBox *_jsonIndex;
 	QHBoxLayout *_entryLayout;

 	std::shared_ptr<MacroActionVariable> _entryData;
--- a/lib/macro/macro-action.cpp
+++ b/lib/macro/macro-action.cpp
@@ -11,12 +11,15 @@ bool MacroAction::Save(obs_data_t *obj) const
 {
 	MacroSegment::Save(obj);
 	obs_data_set_string(obj, "id", GetId().c_str());
+	obs_data_set_bool(obj, "enabled", _enabled);
 	return true;
 }

 bool MacroAction::Load(obs_data_t *obj)
 {
 	MacroSegment::Load(obj);
+	obs_data_set_default_bool(obj, "enabled", true);
+	_enabled = obs_data_get_bool(obj, "enabled");
 	return true;
 }

@@ -25,6 +28,16 @@ void MacroAction::LogAction() const
 	ablog(LOG_INFO, "performed action %s", GetId().c_str());
 }

+void MacroAction::SetEnabled(bool value)
+{
+	_enabled = value;
+}
+
+bool MacroAction::Enabled() const
+{
+	return _enabled;
+}
+
 void MacroAction::ResolveVariablesToFixedValues() {}

 std::string_view MacroAction::GetDefaultID()
--- a/lib/macro/macro-action.hpp
+++ b/lib/macro/macro-action.hpp
@@ -19,9 +19,13 @@ public:
 	// Used to resolve variables before actions are added to action queues
 	virtual void ResolveVariablesToFixedValues();

+	void SetEnabled(bool);
+	bool Enabled() const;
+
 	static std::string_view GetDefaultID();

 private:
+	bool _enabled = true;
 };

 class EXPORT MacroRefAction : virtual public MacroAction {
--- a/lib/macro/macro-condition-edit.cpp
+++ b/lib/macro/macro-condition-edit.cpp
@@ -1,6 +1,6 @@
 #include "macro-condition-edit.hpp"
 #include "advanced-scene-switcher.hpp"
-#include "macro-settings.hpp"
+#include "macro-properties.hpp"
 #include "macro.hpp"
 #include "path-helpers.hpp"
 #include "plugin-state-helpers.hpp"
@@ -10,6 +10,26 @@

 namespace advss {

+static inline void populateLogicSelection(QComboBox *list, bool root = false)
+{
+	if (root) {
+		for (const auto &entry : MacroCondition::logicTypes) {
+			if (static_cast<int>(entry.first) < logic_root_offset) {
+				list->addItem(obs_module_text(
+					entry.second._name.c_str()));
+			}
+		}
+	} else {
+		for (const auto &entry : MacroCondition::logicTypes) {
+			if (static_cast<int>(entry.first) >=
+			    logic_root_offset) {
+				list->addItem(obs_module_text(
+					entry.second._name.c_str()));
+			}
+		}
+	}
+}
+
 static inline void populateConditionSelection(QComboBox *list)
 {
 	for (const auto &[_, condition] :
@@ -100,13 +120,14 @@ void DurationModifierEdit::Collapse(bool collapse)

 MacroConditionEdit::MacroConditionEdit(
 	QWidget *parent, std::shared_ptr<MacroCondition> *entryData,
-	const std::string &id, bool isRootCondition)
-	: MacroSegmentEdit(parent),
+	const std::string &id, bool root)
+	: MacroSegmentEdit(GetGlobalMacroProperties()._highlightConditions,
+			   parent),
 	  _logicSelection(new QComboBox()),
 	  _conditionSelection(new FilterComboBox()),
 	  _dur(new DurationModifierEdit()),
 	  _entryData(entryData),
-	  _isRoot(isRootCondition)
+	  _isRoot(root)
 {
 	QWidget::connect(_logicSelection, SIGNAL(currentIndexChanged(int)),
 			 this, SLOT(LogicSelectionChanged(int)));
@@ -118,8 +139,10 @@ MacroConditionEdit::MacroConditionEdit(
 	QWidget::connect(_dur, SIGNAL(ModifierChanged(DurationModifier::Type)),
 			 this,
 			 SLOT(DurationModifierChanged(DurationModifier::Type)));
+	QWidget::connect(window(), SIGNAL(HighlightConditionsChanged(bool)),
+			 this, SLOT(EnableHighlight(bool)));

-	Logic::PopulateLogicTypeSelection(_logicSelection, isRootCondition);
+	populateLogicSelection(_logicSelection, root);
 	populateConditionSelection(_conditionSelection);

 	_section->AddHeaderWidget(_logicSelection);
@@ -138,7 +161,7 @@ MacroConditionEdit::MacroConditionEdit(
 	mainLayout->addWidget(_frame);
 	setLayout(mainLayout);

-	SetupWidgets(true);
+	UpdateEntryData(id);
 	_loading = false;
 }

@@ -148,25 +171,31 @@ void MacroConditionEdit::LogicSelectionChanged(int idx)
 		return;
 	}

-	auto lock = LockContext();
-	const auto logic = static_cast<Logic::Type>(
-		_logicSelection->itemData(idx).toInt());
-	(*_entryData)->SetLogicType(logic);
+	LogicType type;
+	if (IsRootNode()) {
+		type = static_cast<LogicType>(idx);
+	} else {
+		type = static_cast<LogicType>(idx + logic_root_offset);
+	}

-	SetEnableAppearance(logic != Logic::Type::NONE);
+	auto lock = LockContext();
+	(*_entryData)->SetLogicType(type);
 }

-bool MacroConditionEdit::IsRootNode() const
+bool MacroConditionEdit::IsRootNode()
 {
 	return _isRoot;
 }

 void MacroConditionEdit::SetLogicSelection()
 {
-	const auto logic = (*_entryData)->GetLogicType();
-	_logicSelection->setCurrentIndex(
-		_logicSelection->findData(static_cast<int>(logic)));
-	SetEnableAppearance(logic != Logic::Type::NONE);
+	auto logic = (*_entryData)->GetLogicType();
+	if (IsRootNode()) {
+		_logicSelection->setCurrentIndex(static_cast<int>(logic));
+	} else {
+		_logicSelection->setCurrentIndex(static_cast<int>(logic) -
+						 logic_root_offset);
+	}
 }

 void MacroConditionEdit::SetRootNode(bool root)
@@ -174,40 +203,27 @@ void MacroConditionEdit::SetRootNode(bool root)
 	_isRoot = root;
 	const QSignalBlocker blocker(_logicSelection);
 	_logicSelection->clear();
-	Logic::PopulateLogicTypeSelection(_logicSelection, root);
+	populateLogicSelection(_logicSelection, root);
 	SetLogicSelection();
 }

-void MacroConditionEdit::SetupWidgets(bool basicSetup)
+void MacroConditionEdit::UpdateEntryData(const std::string &id)
 {
-	if (_allWidgetsAreSetup) {
-		return;
-	}
-
-	const auto id = (*_entryData)->GetId();
 	_conditionSelection->setCurrentText(obs_module_text(
 		MacroConditionFactory::GetConditionName(id).c_str()));
-
-	HeaderInfoChanged(
-		QString::fromStdString((*_entryData)->GetShortDesc()));
-	SetLogicSelection();
-
-	_dur->setVisible(MacroConditionFactory::UsesDurationModifier(id));
-	auto modifier = (*_entryData)->GetDurationModifier();
-	_dur->SetValue(modifier);
-
-	if (basicSetup) {
-		return;
-	}
-
 	auto widget =
 		MacroConditionFactory::CreateWidget(id, this, *_entryData);
 	QWidget::connect(widget, SIGNAL(HeaderInfoChanged(const QString &)),
 			 this, SLOT(HeaderInfoChanged(const QString &)));
+	HeaderInfoChanged(
+		QString::fromStdString((*_entryData)->GetShortDesc()));
+	SetLogicSelection();
 	_section->SetContent(widget, (*_entryData)->GetCollapsed());
-	SetFocusPolicyOfWidgets();

-	_allWidgetsAreSetup = true;
+	_dur->setVisible(MacroConditionFactory::UsesDurationModifier(id));
+	auto modifier = (*_entryData)->GetDurationModifier();
+	_dur->SetValue(modifier);
+	SetFocusPolicyOfWidgets();
 }

 void MacroConditionEdit::SetEntryData(std::shared_ptr<MacroCondition> *data)
@@ -283,48 +299,32 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
 	}

 	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
 		return;
 	}

 	std::string id;
-	Logic::Type logic;
+	LogicType logic;
 	if (idx >= 1) {
 		id = macro->Conditions().at(idx - 1)->GetId();
 		if (idx == 1) {
-			logic = Logic::Type::OR;
+			logic = LogicType::OR;
 		} else {
 			logic = macro->Conditions().at(idx - 1)->GetLogicType();
 		}
 	} else {
 		id = MacroCondition::GetDefaultID();
-		logic = Logic::Type::ROOT_NONE;
+		logic = LogicType::ROOT_NONE;
 	}
-
-	OBSDataAutoRelease data;
-	if (idx - 1 >= 0) {
-		data = obs_data_create();
-		macro->Conditions().at(idx - 1)->Save(data);
-	}
-	AddMacroCondition(macro.get(), idx, id, data.Get(), logic);
-}
-
-void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
-					 const std::string &id,
-					 obs_data_t *data, Logic::Type logic)
-{
-	if (idx < 0 || idx > (int)macro->Conditions().size()) {
-		assert(false);
-		return;
-	}
-
 	{
 		auto lock = LockContext();
 		auto cond = macro->Conditions().emplace(
 			macro->Conditions().begin() + idx,
-			MacroConditionFactory::Create(id, macro));
-		if (data) {
+			MacroConditionFactory::Create(id, macro.get()));
+		if (idx - 1 >= 0) {
+			auto data = obs_data_create();
+			macro->Conditions().at(idx - 1)->Save(data);
 			macro->Conditions().at(idx)->Load(data);
+			obs_data_release(data);
 		}
 		macro->Conditions().at(idx)->PostLoad();
 		RunPostLoadSteps();
@@ -337,7 +337,6 @@ void AdvSceneSwitcher::AddMacroCondition(Macro *macro, int idx,
 		SetConditionData(*macro);
 	}
 	HighlightCondition(idx);
-	ui->conditionsList->SetHelpMsgVisible(false);
 	emit(MacroSegmentOrderChanged());
 }

@@ -356,6 +355,7 @@ void AdvSceneSwitcher::on_conditionAdd_clicked()
 	if (currentConditionIdx != -1) {
 		MacroConditionSelectionChanged(currentConditionIdx + 1);
 	}
+	ui->conditionsList->SetHelpMsgVisible(false);
 }

 void AdvSceneSwitcher::RemoveMacroCondition(int idx)
@@ -376,7 +376,7 @@ void AdvSceneSwitcher::RemoveMacroCondition(int idx)
 		macro->UpdateConditionIndices();
 		if (idx == 0 && macro->Conditions().size() > 0) {
 			auto newRoot = macro->Conditions().at(0);
-			newRoot->SetLogicType(Logic::Type::ROOT_NONE);
+			newRoot->SetLogicType(LogicType::ROOT_NONE);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(0))
 				->SetRootNode(true);
@@ -527,23 +527,22 @@ void AdvSceneSwitcher::MacroConditionReorder(int to, int from)
 		auto lock = LockContext();
 		auto condition = macro->Conditions().at(from);
 		if (to == 0) {
-			condition->SetLogicType(Logic::Type::ROOT_NONE);
+			condition->SetLogicType(LogicType::ROOT_NONE);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(from))
 				->SetRootNode(true);
-			macro->Conditions().at(0)->SetLogicType(
-				Logic::Type::AND);
+			macro->Conditions().at(0)->SetLogicType(LogicType::AND);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(0))
 				->SetRootNode(false);
 		}
 		if (from == 0) {
-			condition->SetLogicType(Logic::Type::AND);
+			condition->SetLogicType(LogicType::AND);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(from))
 				->SetRootNode(false);
 			macro->Conditions().at(1)->SetLogicType(
-				Logic::Type::ROOT_NONE);
+				LogicType::ROOT_NONE);
 			static_cast<MacroConditionEdit *>(
 				ui->conditionsList->WidgetAt(1))
 				->SetRootNode(true);
--- a/lib/macro/macro-condition-edit.hpp
+++ b/lib/macro/macro-condition-edit.hpp
@@ -2,7 +2,6 @@
 #include "macro-condition.hpp"
 #include "macro-condition-factory.hpp"
 #include "filter-combo-box.hpp"
-#include "duration-control.hpp"

 #include <memory>

@@ -39,9 +38,9 @@ public:
 		std::shared_ptr<MacroCondition> * = nullptr,
 		const std::string &id = MacroCondition::GetDefaultID().data(),
 		bool root = true);
-	bool IsRootNode() const;
+	bool IsRootNode();
 	void SetRootNode(bool);
-	void SetupWidgets(bool basicSetup = false);
+	void UpdateEntryData(const std::string &id);
 	void SetEntryData(std::shared_ptr<MacroCondition> *);

 private slots:
--- a/lib/macro/macro-condition-factory.cpp
+++ b/lib/macro/macro-condition-factory.cpp
@@ -1,24 +1,7 @@
 #include "macro-condition-factory.hpp"

-#include <mutex>
-
 namespace advss {

-namespace {
-
-class MacroConditionUnknown : public MacroCondition {
-public:
-	MacroConditionUnknown(Macro *m) : MacroCondition(m) {}
-	bool CheckCondition() { return false; }
-	bool Save(obs_data_t *obj) const { return MacroCondition::Save(obj); };
-	bool Load(obs_data_t *obj) { return MacroCondition::Load(obj); };
-	std::string GetId() const { return "unknown"; }
-};
-
-} // namespace
-
-static std::recursive_mutex mutex;
-
 std::map<std::string, MacroConditionInfo> &MacroConditionFactory::GetMap()
 {
 	static std::map<std::string, MacroConditionInfo> _methods;
@@ -28,7 +11,6 @@ std::map<std::string, MacroConditionInfo> &MacroConditionFactory::GetMap()
 bool MacroConditionFactory::Register(const std::string &id,
 				     MacroConditionInfo info)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it == GetMap().end()) {
 		GetMap()[id] = info;
 		return true;
@@ -36,60 +18,35 @@ bool MacroConditionFactory::Register(const std::string &id,
 	return false;
 }

-bool MacroConditionFactory::Deregister(const std::string &id)
-{
-	std::lock_guard<std::recursive_mutex> lock(mutex);
-	if (GetMap().count(id) == 0) {
-		return false;
-	}
-	GetMap().erase(id);
-	return true;
-}
-
-static std::shared_ptr<MacroCondition> createUnknownCondition(Macro *m)
-{
-	return std::make_shared<MacroConditionUnknown>(m);
-}
-
 std::shared_ptr<MacroCondition>
 MacroConditionFactory::Create(const std::string &id, Macro *m)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._create(m);
 	}
-	return createUnknownCondition(m);
-}
-
-static QWidget *createUnknownConditionWidget()
-{
-	return new QLabel(
-		obs_module_text("AdvSceneSwitcher.condition.unknown"));
+	return nullptr;
 }

 QWidget *
 MacroConditionFactory::CreateWidget(const std::string &id, QWidget *parent,
 				    std::shared_ptr<MacroCondition> cond)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._createWidget(parent, cond);
 	}
-	return createUnknownConditionWidget();
+	return nullptr;
 }

 std::string MacroConditionFactory::GetConditionName(const std::string &id)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._name;
 	}
-	return obs_module_text("AdvSceneSwitcher.condition.unknown");
+	return "unknown condition";
 }

 std::string MacroConditionFactory::GetIdByName(const QString &name)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	for (auto it : GetMap()) {
 		if (name == obs_module_text(it.second._name.c_str())) {
 			return it.first;
@@ -100,21 +57,10 @@ std::string MacroConditionFactory::GetIdByName(const QString &name)

 bool MacroConditionFactory::UsesDurationModifier(const std::string &id)
 {
-	std::lock_guard<std::recursive_mutex> lock(mutex);
 	if (auto it = GetMap().find(id); it != GetMap().end()) {
 		return it->second._useDurationModifier;
 	}
 	return false;
 }

-bool CanCreateDefaultCondition()
-{
-	const auto condition = MacroConditionFactory::Create(
-		MacroCondition::GetDefaultID().data(), nullptr);
-	if (!condition) {
-		return false;
-	}
-	return condition->GetId() == MacroCondition::GetDefaultID().data();
-}
-
 } // namespace advss
--- a/lib/macro/macro-condition-factory.hpp
+++ b/lib/macro/macro-condition-factory.hpp
@@ -6,11 +6,10 @@
 namespace advss {

 struct MacroConditionInfo {
+	using CreateCondition = std::shared_ptr<MacroCondition> (*)(Macro *m);
 	using CreateConditionWidget =
 		QWidget *(*)(QWidget *parent, std::shared_ptr<MacroCondition>);
-
-	std::function<std::shared_ptr<MacroCondition>(Macro *m)> _create =
-		nullptr;
+	CreateCondition _create = nullptr;
 	CreateConditionWidget _createWidget = nullptr;
 	std::string _name;
 	bool _useDurationModifier = true;
@@ -20,7 +19,6 @@ class MacroConditionFactory {
 public:
 	MacroConditionFactory() = delete;
 	EXPORT static bool Register(const std::string &, MacroConditionInfo);
-	EXPORT static bool Deregister(const std::string &);
 	static std::shared_ptr<MacroCondition> Create(const std::string &,
 						      Macro *m);
 	static QWidget *CreateWidget(const std::string &id, QWidget *parent,
@@ -34,6 +32,4 @@ private:
 	static std::map<std::string, MacroConditionInfo> &GetMap();
 };

-bool CanCreateDefaultCondition();
-
 } // namespace advss
--- a/lib/macro/macro-condition-macro.cpp
+++ b/lib/macro/macro-condition-macro.cpp
@@ -58,7 +58,7 @@ bool MacroConditionMacro::CheckStateCondition()
 		return false;
 	}

-	return macro->ConditionsMatched();
+	return macro->Matched();
 }

 bool MacroConditionMacro::CheckMultiStateCondition()
@@ -72,7 +72,7 @@ bool MacroConditionMacro::CheckMultiStateCondition()
 		if (!macro) {
 			continue;
 		}
-		if (macro->ConditionsMatched()) {
+		if (macro->Matched()) {
 			matchedCount++;
 		}
 	}
@@ -538,7 +538,11 @@ void MacroConditionMacroEdit::UpdateEntryData()

 void MacroConditionMacroEdit::MacroChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_macro = text;
 	_actionIndex->SetMacro(_entryData->_macro.GetMacro());
 	emit HeaderInfoChanged(
@@ -547,13 +551,21 @@ void MacroConditionMacroEdit::MacroChanged(const QString &text)

 void MacroConditionMacroEdit::CountChanged(const NumberVariable<int> &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_count = value;
 }

 void MacroConditionMacroEdit::CountConditionChanged(int cond)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_counterCondition =
 		static_cast<MacroConditionMacro::CounterCondition>(cond);
 }
@@ -578,7 +590,11 @@ void MacroConditionMacroEdit::MacroRemove(const QString &)

 void MacroConditionMacroEdit::TypeChanged(int type)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->SetType(static_cast<MacroConditionMacro::Type>(type));
 	SetupWidgets();
 }
@@ -624,7 +640,11 @@ void MacroConditionMacroEdit::UpdatePaused()

 void MacroConditionMacroEdit::MultiStateConditionChanged(int cond)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_multiSateCondition =
 		static_cast<MacroConditionMacro::MultiStateCondition>(cond);
 }
@@ -632,13 +652,21 @@ void MacroConditionMacroEdit::MultiStateConditionChanged(int cond)
 void MacroConditionMacroEdit::MultiStateCountChanged(
 	const NumberVariable<int> &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_multiSateCount = value;
 }

 void MacroConditionMacroEdit::Add(const std::string &name)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	MacroRef macro(name);
 	_entryData->_macros.push_back(macro);
 	adjustSize();
@@ -647,7 +675,11 @@ void MacroConditionMacroEdit::Add(const std::string &name)

 void MacroConditionMacroEdit::Remove(int idx)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx));
 	adjustSize();
 	updateGeometry();
@@ -655,8 +687,12 @@ void MacroConditionMacroEdit::Remove(int idx)

 void MacroConditionMacroEdit::Replace(int idx, const std::string &name)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
 	MacroRef macro(name);
+	auto lock = LockContext();
 	_entryData->_macros[idx] = macro;
 	adjustSize();
 	updateGeometry();
@@ -664,7 +700,11 @@ void MacroConditionMacroEdit::Replace(int idx, const std::string &name)

 void MacroConditionMacroEdit::ActionIndexChanged(const IntVariable &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_actionIndex = value;
 }

--- a/lib/macro/macro-condition-macro.hpp
+++ b/lib/macro/macro-condition-macro.hpp
@@ -9,6 +9,7 @@
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QTimer>
+#include <QListWidget>

 namespace advss {

--- a/lib/macro/macro-condition-queue.cpp
+++ b/lib/macro/macro-condition-queue.cpp
@@ -27,9 +27,6 @@ bool MacroConditionQueue::CheckCondition()
 		return false;
 	}

-	SetTempVarValue("size", std::to_string(queue->Size()));
-	SetTempVarValue("running", queue->IsRunning());
-
 	switch (_condition) {
 	case Condition::STARTED:
 		return queue->IsRunning();
@@ -66,18 +63,6 @@ std::string MacroConditionQueue::GetShortDesc() const
 	return GetActionQueueName(_queue);
 }

-void MacroConditionQueue::SetupTempVars()
-{
-	MacroCondition::SetupTempVars();
-	AddTempvar("size",
-		   obs_module_text("AdvSceneSwitcher.tempVar.queue.size"));
-	AddTempvar(
-		"running",
-		obs_module_text("AdvSceneSwitcher.tempVar.queue.running"),
-		obs_module_text(
-			"AdvSceneSwitcher.tempVar.queue.running.description"));
-}
-
 static inline void populateQueueTypeSelection(QComboBox *list)
 {
 	for (const auto &[_, name] : conditionTypes) {
@@ -115,7 +100,11 @@ MacroConditionQueueEdit::MacroConditionQueueEdit(

 void MacroConditionQueueEdit::ConditionChanged(int condition)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_condition =
 		static_cast<MacroConditionQueue::Condition>(condition);
 	emit HeaderInfoChanged(
@@ -125,7 +114,11 @@ void MacroConditionQueueEdit::ConditionChanged(int condition)

 void MacroConditionQueueEdit::QueueChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_queue = GetWeakActionQueueByQString(text);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -133,7 +126,11 @@ void MacroConditionQueueEdit::QueueChanged(const QString &text)

 void MacroConditionQueueEdit::SizeChanged(const NumberVariable<int> &value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_size = value;
 }

@@ -144,7 +141,6 @@ void MacroConditionQueueEdit::UpdateEntryData()
 	}
 	_conditions->setCurrentIndex(static_cast<int>(_entryData->_condition));
 	_queues->SetActionQueue(_entryData->_queue);
-	_size->SetValue(_entryData->_size);
 	SetWidgetVisibility();
 }

--- a/lib/macro/macro-condition-queue.hpp
+++ b/lib/macro/macro-condition-queue.hpp
@@ -32,8 +32,6 @@ public:
 	IntVariable _size = 1;

 private:
-	void SetupTempVars();
-
 	static bool _registered;
 	static const std::string id;
 };
--- a/lib/macro/macro-condition-tempvar.cpp
+++ b/lib/macro/macro-condition-tempvar.cpp
@@ -264,19 +264,32 @@ void MacroConditionTempVarEdit::UpdateEntryData()

 void MacroConditionTempVarEdit::VariableChanged(const TempVariableRef &var)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_tempVar = var;
 }

 void MacroConditionTempVarEdit::Variable2Changed(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }

 void MacroConditionTempVarEdit::ConditionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_type =
 		static_cast<MacroConditionTempVar::Condition>(value);
 	SetWidgetVisibility();
@@ -284,7 +297,11 @@ void MacroConditionTempVarEdit::ConditionChanged(int value)

 void MacroConditionTempVarEdit::StrValueChanged()
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -292,13 +309,21 @@ void MacroConditionTempVarEdit::StrValueChanged()

 void MacroConditionTempVarEdit::NumValueChanged(double val)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_numValue = val;
 }

 void MacroConditionTempVarEdit::RegexChanged(const RegexConfig &conf)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();
--- a/lib/macro/macro-condition-variable.cpp
+++ b/lib/macro/macro-condition-variable.cpp
@@ -236,7 +236,11 @@ void MacroConditionVariableEdit::UpdateEntryData()

 void MacroConditionVariableEdit::VariableChanged(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_variable = GetWeakVariableByQString(text);
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
@@ -244,13 +248,22 @@ void MacroConditionVariableEdit::VariableChanged(const QString &text)

 void MacroConditionVariableEdit::Variable2Changed(const QString &text)
 {
-	GUARD_LOADING_AND_LOCK();
+
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_variable2 = GetWeakVariableByQString(text);
 }

 void MacroConditionVariableEdit::ConditionChanged(int value)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_type =
 		static_cast<MacroConditionVariable::Condition>(value);
 	SetWidgetVisibility();
@@ -258,7 +271,11 @@ void MacroConditionVariableEdit::ConditionChanged(int value)

 void MacroConditionVariableEdit::StrValueChanged()
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_strValue = _strValue->toPlainText().toStdString();
 	adjustSize();
 	updateGeometry();
@@ -266,13 +283,21 @@ void MacroConditionVariableEdit::StrValueChanged()

 void MacroConditionVariableEdit::NumValueChanged(double val)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_numValue = val;
 }

 void MacroConditionVariableEdit::RegexChanged(const RegexConfig &conf)
 {
-	GUARD_LOADING_AND_LOCK();
+	if (_loading || !_entryData) {
+		return;
+	}
+
+	auto lock = LockContext();
 	_entryData->_regex = conf;
 	adjustSize();
 	updateGeometry();
--- a/lib/macro/macro-condition.cpp
+++ b/lib/macro/macro-condition.cpp
@@ -2,6 +2,79 @@

 namespace advss {

+const std::map<LogicType, LogicTypeInfo> MacroCondition::logicTypes = {
+	{LogicType::NONE, {"AdvSceneSwitcher.logic.none"}},
+	{LogicType::AND, {"AdvSceneSwitcher.logic.and"}},
+	{LogicType::OR, {"AdvSceneSwitcher.logic.or"}},
+	{LogicType::AND_NOT, {"AdvSceneSwitcher.logic.andNot"}},
+	{LogicType::OR_NOT, {"AdvSceneSwitcher.logic.orNot"}},
+	{LogicType::ROOT_NONE, {"AdvSceneSwitcher.logic.rootNone"}},
+	{LogicType::ROOT_NOT, {"AdvSceneSwitcher.logic.not"}},
+};
+
+void DurationModifier::Save(obs_data_t *obj, const char *condName,
+			    const char *duration) const
+{
+	obs_data_set_int(obj, condName, static_cast<int>(_type));
+	_dur.Save(obj, duration);
+}
+
+void DurationModifier::Load(obs_data_t *obj, const char *condName,
+			    const char *duration)
+{
+	// For backwards compatibility check if duration value exist without
+	// time constraint condition - if so assume DurationCondition::MORE
+	if (!obs_data_has_user_value(obj, condName) &&
+	    obs_data_has_user_value(obj, duration)) {
+		obs_data_set_int(obj, condName, static_cast<int>(Type::MORE));
+	}
+
+	_type = static_cast<Type>(obs_data_get_int(obj, condName));
+	_dur.Load(obj, duration);
+
+	// TODO: remove this fallback
+	if (obs_data_has_user_value(obj, "displayUnit")) {
+		_dur.SetUnit(static_cast<Duration::Unit>(
+			obs_data_get_int(obj, "displayUnit")));
+	}
+}
+
+bool DurationModifier::DurationReached()
+{
+	switch (_type) {
+	case DurationModifier::Type::NONE:
+		return true;
+		break;
+	case DurationModifier::Type::MORE:
+		return _dur.DurationReached();
+		break;
+	case DurationModifier::Type::EQUAL:
+		if (_dur.DurationReached() && !_timeReached) {
+			_timeReached = true;
+			return true;
+		}
+		break;
+	case DurationModifier::Type::LESS:
+		return !_dur.DurationReached();
+		break;
+	case DurationModifier::Type::WITHIN:
+		if (_dur.IsReset()) {
+			return false;
+		}
+		return !_dur.DurationReached();
+		break;
+	default:
+		break;
+	}
+	return false;
+}
+
+void DurationModifier::Reset()
+{
+	_timeReached = false;
+	_dur.Reset();
+}
+
 MacroCondition::MacroCondition(Macro *m, bool supportsVariableValue)
 	: MacroSegment(m, supportsVariableValue)
 {
@@ -11,64 +84,73 @@ bool MacroCondition::Save(obs_data_t *obj) const
 {
 	MacroSegment::Save(obj);
 	obs_data_set_string(obj, "id", GetId().c_str());
-	_logic.Save(obj, "logic");
-	_durationModifier.Save(obj);
+	obs_data_set_int(obj, "logic", static_cast<int>(_logic));
+
+	// To avoid conflicts with conditions which also use the Duration class
+	// save the duration modifier in a separate obj
+	auto durObj = obs_data_create();
+	_duration.Save(durObj);
+	obs_data_set_obj(obj, "durationModifier", durObj);
+	obs_data_release(durObj);
+
 	return true;
 }

 bool MacroCondition::Load(obs_data_t *obj)
 {
 	MacroSegment::Load(obj);
-	_logic.Load(obj, "logic");
-	_durationModifier.Load(obj);
+	_logic = static_cast<LogicType>(obs_data_get_int(obj, "logic"));
+	if (obs_data_has_user_value(obj, "durationModifier")) {
+		auto durObj = obs_data_get_obj(obj, "durationModifier");
+		_duration.Load(durObj);
+		obs_data_release(durObj);
+	} else {
+		// For backwards compatibility
+		_duration.Load(obj);
+	}
 	return true;
 }

-void MacroCondition::ValidateLogicSelection(bool isRootCondition,
-					    const char *context)
-{
-	if (_logic.IsValidSelection(isRootCondition)) {
-		return;
-	}
-
-	if (_logic.IsRootType()) {
-		_logic.SetType(Logic::Type::ROOT_NONE);
-		blog(LOG_WARNING,
-		     "setting invalid logic selection to 'if' for macro %s",
-		     context);
-		return;
-	}
-
-	_logic.SetType(Logic::Type::NONE);
-	blog(LOG_WARNING,
-	     "setting invalid logic selection to 'ignore' for macro %s",
-	     context);
-}
-
 void MacroCondition::ResetDuration()
 {
-	_durationModifier.ResetDuration();
+	_duration.Reset();
 }

-bool MacroCondition::CheckDurationModifier(bool conditionValue)
+void MacroCondition::CheckDurationModifier(bool &val)
 {
-	return _durationModifier.CheckConditionWithDurationModifier(
-		conditionValue);
-}
-
-DurationModifier MacroCondition::GetDurationModifier() const
-{
-	return _durationModifier;
+	if (_duration.GetType() != DurationModifier::Type::WITHIN && !val) {
+		_duration.Reset();
+	}
+	if (_duration.GetType() == DurationModifier::Type::WITHIN && val) {
+		_duration.Reset();
+	}
+	switch (_duration.GetType()) {
+	case DurationModifier::Type::NONE:
+	case DurationModifier::Type::MORE:
+	case DurationModifier::Type::EQUAL:
+	case DurationModifier::Type::LESS:
+		val = val && _duration.DurationReached();
+		return;
+	case DurationModifier::Type::WITHIN:
+		if (val) {
+			_duration.SetTimeRemaining(
+				_duration.GetDuration().Seconds());
+		}
+		val = val || _duration.DurationReached();
+		break;
+	default:
+		break;
+	}
 }

 void MacroCondition::SetDurationModifier(DurationModifier::Type m)
 {
-	_durationModifier.SetModifier(m);
+	_duration.SetModifier(m);
 }

 void MacroCondition::SetDuration(const Duration &duration)
 {
-	_durationModifier.SetDuration(duration);
+	_duration.SetValue(duration);
 }

 std::string_view MacroCondition::GetDefaultID()
--- a/lib/macro/macro-condition.hpp
+++ b/lib/macro/macro-condition.hpp
@@ -1,11 +1,63 @@
 #pragma once
 #include "macro-segment.hpp"
-#include "condition-logic.hpp"
-#include "duration-modifier.hpp"
 #include "macro-ref.hpp"
+#include <duration-control.hpp>

 namespace advss {

+constexpr auto logic_root_offset = 100;
+
+enum class LogicType {
+	ROOT_NONE = 0,
+	ROOT_NOT,
+	ROOT_LAST,
+	// leave some space for potential expansion
+	NONE = 100,
+	AND,
+	OR,
+	AND_NOT,
+	OR_NOT,
+	LAST,
+};
+
+static inline bool isRootLogicType(LogicType l)
+{
+	return static_cast<int>(l) < logic_root_offset;
+}
+
+struct LogicTypeInfo {
+	std::string _name;
+};
+
+class DurationModifier {
+public:
+	enum class Type {
+		NONE,
+		MORE,
+		EQUAL,
+		LESS,
+		WITHIN, // Condition will remain true for a set a amount of time
+			// regardless of current state
+	};
+
+	void Save(obs_data_t *obj, const char *condName = "time_constraint",
+		  const char *duration = "seconds") const;
+	void Load(obs_data_t *obj, const char *condName = "time_constraint",
+		  const char *duration = "seconds");
+	void SetModifier(Type cond) { _type = cond; }
+	void SetTimeRemaining(const double &val) { _dur.SetTimeRemaining(val); }
+	void SetValue(const Duration &value) { _dur = value; }
+	Type GetType() { return _type; }
+	Duration GetDuration() { return _dur; }
+	bool DurationReached();
+	void Reset();
+
+private:
+	Type _type = Type::NONE;
+	Duration _dur;
+	bool _timeReached = false;
+};
+
 class EXPORT MacroCondition : public MacroSegment {
 public:
 	MacroCondition(Macro *m, bool supportsVariableValue = false);
@@ -13,24 +65,20 @@ public:
 	virtual bool CheckCondition() = 0;
 	virtual bool Save(obs_data_t *obj) const = 0;
 	virtual bool Load(obs_data_t *obj) = 0;
-
-	Logic::Type GetLogicType() const { return _logic.GetType(); }
-	void SetLogicType(const Logic::Type &logic) { _logic.SetType(logic); }
-
-	void ValidateLogicSelection(bool isRootCondition, const char *context);
-
-	DurationModifier GetDurationModifier() const;
+	LogicType GetLogicType() { return _logic; }
+	void SetLogicType(LogicType logic) { _logic = logic; }
+	static const std::map<LogicType, LogicTypeInfo> logicTypes;
+	void ResetDuration();
+	void CheckDurationModifier(bool &val);
+	DurationModifier GetDurationModifier() { return _duration; }
 	void SetDurationModifier(DurationModifier::Type m);
 	void SetDuration(const Duration &duration);

-	void ResetDuration();
-	bool CheckDurationModifier(bool conditionValue);
-
 	static std::string_view GetDefaultID();

 private:
-	Logic _logic = Logic(Logic::Type::ROOT_NONE);
-	DurationModifier _durationModifier;
+	LogicType _logic = LogicType::ROOT_NONE;
+	DurationModifier _duration;
 };

 class EXPORT MacroRefCondition : virtual public MacroCondition {
--- a/lib/macro/macro-dock.cpp
+++ b/lib/macro/macro-dock.cpp
@@ -6,14 +6,14 @@

 namespace advss {

-MacroDock::MacroDock(std::weak_ptr<Macro> m,
+MacroDock::MacroDock(std::weak_ptr<Macro> m, QWidget *parent,
 		     const StringVariable &runButtonText,
 		     const StringVariable &pauseButtonText,
 		     const StringVariable &unpauseButtonText,
 		     const StringVariable &conditionsTrueText,
 		     const StringVariable &conditionsFalseText,
 		     bool enableHighlight)
-	: QFrame(),
+	: OBSDock(parent),
 	  _runButtonText(runButtonText),
 	  _pauseButtonText(pauseButtonText),
 	  _unpauseButtonText(unpauseButtonText),
@@ -25,16 +25,19 @@ MacroDock::MacroDock(std::weak_ptr<Macro> m,
 	  _statusText(new QLabel(conditionsFalseText.c_str())),
 	  _macro(m)
 {
-	setFrameShape(QFrame::StyledPanel);
-	setFrameShadow(QFrame::Sunken);
-
 	auto macro = _macro.lock();
 	if (macro) {
+		setWindowTitle(QString::fromStdString(macro->Name()));
 		_run->setVisible(macro->DockHasRunButton());
 		_pauseToggle->setVisible(macro->DockHasPauseButton());
 		_statusText->setVisible(macro->DockHasStatusLabel());
+	} else {
+		setWindowTitle("<deleted macro>");
 	}

+	setFeatures(DockWidgetClosable | DockWidgetMovable |
+		    DockWidgetFloatable);
+
 	QWidget::connect(_run, SIGNAL(clicked()), this, SLOT(RunClicked()));
 	QWidget::connect(_pauseToggle, SIGNAL(clicked()), this,
 			 SLOT(PauseToggleClicked()));
@@ -49,7 +52,21 @@ MacroDock::MacroDock(std::weak_ptr<Macro> m,
 	QWidget::connect(&_timer, SIGNAL(timeout()), this, SLOT(Highlight()));
 	_timer.start(500);

-	setLayout(layout);
+	// QFrame wrapper is necessary to avoid dock being partially
+	// transparent
+	QFrame *wrapper = new QFrame;
+	wrapper->setFrameShape(QFrame::StyledPanel);
+	wrapper->setFrameShadow(QFrame::Sunken);
+	wrapper->setLayout(layout);
+	setWidget(wrapper);
+
+	setFloating(true);
+	hide();
+}
+
+void MacroDock::SetName(const QString &name)
+{
+	setWindowTitle(name);
 }

 void MacroDock::ShowRunButton(bool value)
@@ -138,9 +155,8 @@ void MacroDock::UpdateText()

 	_pauseToggle->setText(macro->Paused() ? _unpauseButtonText.c_str()
 					      : _pauseButtonText.c_str());
-	_statusText->setText(macro->ConditionsMatched()
-				     ? _conditionsTrueText.c_str()
-				     : _conditionsFalseText.c_str());
+	_statusText->setText(macro->Matched() ? _conditionsTrueText.c_str()
+					      : _conditionsFalseText.c_str());
 }

 void MacroDock::Highlight()
@@ -151,7 +167,7 @@ void MacroDock::Highlight()
 	}
 	if (_lastHighlightCheckTime.time_since_epoch().count() != 0 &&
 	    macro->WasExecutedSince(_lastHighlightCheckTime)) {
-		HighlightWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
+		PulseWidget(this, Qt::green, QColor(0, 0, 0, 0), true);
 	}
 	_lastHighlightCheckTime = std::chrono::high_resolution_clock::now();
 }
--- a/lib/macro/macro-dock.hpp
+++ b/lib/macro/macro-dock.hpp
@@ -1,9 +1,10 @@
 #pragma once
+#include "obs-dock.hpp"
 #include "variable-string.hpp"

-#include <QLabel>
 #include <QPushButton>
 #include <QTimer>
+#include <QLabel>
 #include <memory>
 #include <chrono>

@@ -11,16 +12,18 @@ namespace advss {

 class Macro;

-class MacroDock : public QFrame {
+class MacroDock : public OBSDock {
 	Q_OBJECT

 public:
-	MacroDock(std::weak_ptr<Macro>, const StringVariable &runButtonText,
+	MacroDock(std::weak_ptr<Macro>, QWidget *parent,
+		  const StringVariable &runButtonText,
 		  const StringVariable &pauseButtonText,
 		  const StringVariable &unpauseButtonText,
 		  const StringVariable &conditionsTrueText,
 		  const StringVariable &conditionsFalseText,
 		  bool enableHighlight);
+	void SetName(const QString &);
 	void ShowRunButton(bool);
 	void SetRunButtonText(const StringVariable &);
 	void ShowPauseButton(bool);
--- a/lib/macro/macro-helpers.cpp
+++ b/lib/macro/macro-helpers.cpp
@@ -67,7 +67,9 @@ void SetMacroSwitchedScene(bool value)
 {
 	static bool setupDone = false;
 	if (!setupDone) {
-		AddIntervalResetStep([]() { macroSceneSwitched = false; });
+		// Will always be called with switcher lock already held
+		AddIntervalResetStep([]() { macroSceneSwitched = false; },
+				     false);
 		setupDone = true;
 	}
 	macroSceneSwitched = value;
@@ -78,43 +80,33 @@ bool MacroSwitchedScene()
 	return macroSceneSwitched;
 }

-std::string GetMacroName(const Macro *macro)
+std::string GetMacroName(Macro *macro)
 {
 	return macro ? macro->Name() : "";
 }

-std::chrono::high_resolution_clock::time_point
-LastMacroConditionCheckTime(const Macro *macro)
+int64_t MillisecondsSinceMacroConditionCheck(Macro *macro)
 {
-	return macro ? macro->LastConditionCheckTime()
-		     : std::chrono::high_resolution_clock::time_point{};
+	return macro ? macro->MsSinceLastCheck() : 0;
 }

-bool MacroIsStopped(const Macro *macro)
+bool MacroIsStopped(Macro *macro)
 {
 	return macro ? macro->GetStop() : true;
 }

-bool MacroIsPaused(const Macro *macro)
+bool MacroIsPaused(Macro *macro)
 {
 	return macro ? macro->Paused() : true;
 }

 bool MacroWasPausedSince(
-	const Macro *macro,
+	Macro *macro,
 	const std::chrono::high_resolution_clock::time_point &time)
 {
 	return macro ? macro->WasPausedSince(time) : false;
 }

-bool MacroWasCheckedSinceLastStart(const Macro *macro)
-{
-	if (!macro) {
-		return false;
-	}
-	return macro->LastConditionCheckTime().time_since_epoch().count() != 0;
-}
-
 void AddMacroHelperThread(Macro *macro, std::thread &&newThread)
 {
 	if (!macro) {
@@ -144,7 +136,7 @@ void ResetMacroRunCount(Macro *macro)
 	macro->ResetRunCount();
 }

-bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition)
+bool IsValidMacroSegmentIndex(Macro *m, const int idx, bool isCondition)
 {
 	if (!m || idx < 0) {
 		return false;
--- a/lib/macro/macro-helpers.hpp
+++ b/lib/macro/macro-helpers.hpp
@@ -41,17 +41,15 @@ EXPORT std::atomic_int &GetShutdownConditionCount();
 EXPORT void SetMacroSwitchedScene(bool value);
 EXPORT bool MacroSwitchedScene();

-EXPORT std::string GetMacroName(const Macro *);
+EXPORT std::string GetMacroName(Macro *);

-EXPORT std::chrono::high_resolution_clock::time_point
-LastMacroConditionCheckTime(const Macro *);
+EXPORT int64_t MillisecondsSinceMacroConditionCheck(Macro *);

-EXPORT bool MacroIsStopped(const Macro *);
-EXPORT bool MacroIsPaused(const Macro *);
+EXPORT bool MacroIsStopped(Macro *);
+EXPORT bool MacroIsPaused(Macro *);
 EXPORT bool
-MacroWasPausedSince(const Macro *,
+MacroWasPausedSince(Macro *,
 		    const std::chrono::high_resolution_clock::time_point &);
-EXPORT bool MacroWasCheckedSinceLastStart(const Macro *);

 EXPORT void AddMacroHelperThread(Macro *, std::thread &&);

@@ -68,6 +66,6 @@ EXPORT void InvalidateMacroTempVarValues();
 EXPORT void ResetMacroConditionTimers(Macro *);
 EXPORT void ResetMacroRunCount(Macro *);

-bool IsValidMacroSegmentIndex(const Macro *m, const int idx, bool isCondition);
+bool IsValidMacroSegmentIndex(Macro *m, const int idx, bool isCondition);

 } // namespace advss
--- a/lib/macro/macro-input.cpp
+++ b/lib/macro/macro-input.cpp
@@ -1,233 +0,0 @@
-#include "macro-input.hpp"
-#include "layout-helpers.hpp"
-#include "log-helper.hpp"
-#include "obs-module-helper.hpp"
-#include "variable-line-edit.hpp"
-
-#include <algorithm>
-#include <obs.hpp>
-
-namespace advss {
-
-void MacroInputVariables::Save(obs_data_t *obj) const
-{
-	OBSDataArrayAutoRelease array = obs_data_array_create();
-	for (auto &var : _inputVariables) {
-		OBSDataAutoRelease arrayObj = obs_data_create();
-		auto variable = var.lock();
-		if (variable) {
-			obs_data_set_string(arrayObj, "variableName",
-					    variable->Name().c_str());
-		} else {
-			obs_data_set_bool(arrayObj, "invalidVariable", true);
-		}
-		obs_data_array_push_back(array, arrayObj);
-	}
-	obs_data_set_array(obj, "inputVariables", array);
-}
-
-void MacroInputVariables::Load(obs_data_t *obj)
-{
-	OBSDataArrayAutoRelease array =
-		obs_data_get_array(obj, "inputVariables");
-	const size_t count = obs_data_array_count(array);
-	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease arrayObj = obs_data_array_item(array, i);
-		const bool isInvalid =
-			obs_data_get_bool(arrayObj, "invalidVariable");
-		if (isInvalid) {
-			_inputVariables.emplace_back();
-		} else {
-			const auto name =
-				obs_data_get_string(arrayObj, "variableName");
-			_inputVariables.emplace_back(
-				GetWeakVariableByName(name));
-		}
-	}
-}
-
-void MacroInputVariables::SetValues(const StringList &values)
-{
-	if (_inputVariables.size() != (size_t)values.size()) {
-		blog(LOG_WARNING,
-		     "%s - sizes do not match (variables: %d, values %d)",
-		     __func__, (int)_inputVariables.size(), (int)values.size());
-	}
-
-	for (size_t index = 0;
-	     index < _inputVariables.size() && index < (size_t)values.size();
-	     index++) {
-		auto variable = _inputVariables.at(index).lock();
-		if (!variable) {
-			continue;
-		}
-
-		variable->SetValue(values.at(index));
-	}
-}
-
-MacroInputSelection::MacroInputSelection(QWidget *parent) : ListEditor(parent)
-{
-	_list->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
-}
-
-void MacroInputSelection::SetInputs(const MacroInputVariables &inputs)
-{
-	_currentSelection = inputs;
-	for (const auto &var : inputs._inputVariables) {
-		auto variable = var.lock();
-		const auto name =
-			variable
-				? QString::fromStdString(variable->Name())
-				: obs_module_text(
-					  "AdvSceneSwitcher.macroTab.inputSettings.invalid");
-
-		QVariant v = QVariant::fromValue(name);
-		auto item = new QListWidgetItem(name, _list);
-		item->setData(Qt::UserRole, name);
-	}
-	UpdateListSize();
-}
-
-void MacroInputSelection::Add()
-{
-	std::string varName;
-	bool accepted = VariableSelectionDialog::AskForVariable(varName);
-
-	if (!accepted || varName.empty()) {
-		return;
-	}
-
-	_currentSelection._inputVariables.emplace_back(
-		GetWeakVariableByName(varName));
-
-	QVariant v = QVariant::fromValue(QString::fromStdString(varName));
-	auto item = new QListWidgetItem(QString::fromStdString(varName), _list);
-	item->setData(Qt::UserRole, QString::fromStdString(varName));
-	UpdateListSize();
-}
-
-void MacroInputSelection::Remove()
-{
-	auto item = _list->currentItem();
-	int idx = _list->currentRow();
-	if (!item || idx == -1) {
-		return;
-	}
-
-	_currentSelection._inputVariables.erase(
-		std::next(_currentSelection._inputVariables.begin(), idx));
-
-	delete item;
-	UpdateListSize();
-}
-
-void MacroInputSelection::Up()
-{
-	int idx = _list->currentRow();
-	if (idx < 1) {
-		return;
-	}
-
-	_list->insertItem(idx - 1, _list->takeItem(idx));
-	_list->setCurrentRow(idx - 1);
-
-	std::iter_swap(
-		std::next(_currentSelection._inputVariables.begin(), idx),
-		std::next(_currentSelection._inputVariables.begin(), idx - 1));
-}
-
-void MacroInputSelection::Down()
-{
-	int idx = _list->currentRow();
-	if (idx < 0 || idx >= _list->count()) {
-		return;
-	}
-
-	_list->insertItem(idx + 1, _list->takeItem(idx));
-	_list->setCurrentRow(idx + 1);
-
-	std::iter_swap(
-		std::next(_currentSelection._inputVariables.begin(), idx + 1),
-		std::next(_currentSelection._inputVariables.begin(), idx));
-}
-
-void MacroInputSelection::Clicked(QListWidgetItem *item)
-{
-	std::string varName;
-	bool accepted = VariableSelectionDialog::AskForVariable(varName);
-
-	if (!accepted || varName.empty()) {
-		return;
-	}
-
-	item->setText(QString::fromStdString(varName));
-	int idx = _list->currentRow();
-
-	_currentSelection._inputVariables.at(idx) =
-		GetWeakVariableByName(varName);
-}
-
-MacroInputEdit::MacroInputEdit(QWidget *parent)
-	: QWidget(parent),
-	  _layout(new QGridLayout())
-{
-	setLayout(_layout);
-}
-
-void MacroInputEdit::SetInputVariablesAndValues(
-	const MacroInputVariables &inputs, const StringList &values)
-{
-	_variables = inputs;
-	_values = values;
-	if ((size_t)_values.size() < _variables._inputVariables.size()) {
-		_values.resize(_variables._inputVariables.size());
-	}
-	SetupWidgets();
-}
-
-bool MacroInputEdit::HasInputsToSet() const
-{
-	return !_variables._inputVariables.empty();
-}
-
-void HighlightMacroSettingsButton(bool enable);
-
-void MacroInputEdit::SetupWidgets()
-{
-	ClearLayout(_layout);
-
-	auto &vars = _variables._inputVariables;
-	if (vars.empty()) {
-		_layout->addWidget(new QLabel(obs_module_text(
-			"AdvSceneSwitcher.macroTab.inputSettings.noInputs")));
-		adjustSize();
-		updateGeometry();
-		return;
-	}
-
-	for (size_t index = 0; index < vars.size(); index++) {
-		auto variable = vars.at(index).lock();
-		QLabel *label = new QLabel(
-			variable
-				? QString::fromStdString(variable->Name())
-				: obs_module_text(
-					  "AdvSceneSwitcher.macroTab.inputSettings.invalid"));
-		_layout->addWidget(label, index, 0);
-		auto valueEdit = new VariableLineEdit(this);
-		valueEdit->setEnabled(!!variable);
-		valueEdit->setText(_values.at(index));
-		connect(valueEdit, &VariableLineEdit::editingFinished,
-			[this, valueEdit, index]() {
-				_values[index] =
-					valueEdit->text().toStdString();
-				emit MacroInputValuesChanged(_values);
-			});
-		_layout->addWidget(valueEdit, index, 1);
-	}
-
-	adjustSize();
-	updateGeometry();
-}
-
-} // namespace advss
--- a/lib/macro/macro-input.hpp
+++ b/lib/macro/macro-input.hpp
@@ -1,63 +0,0 @@
-#pragma once
-#include "list-editor.hpp"
-#include "string-list.hpp"
-#include "variable.hpp"
-
-#include <QGridLayout>
-#include <memory>
-#include <vector>
-
-namespace advss {
-
-class MacroInputVariables {
-public:
-	void Save(obs_data_t *obj) const;
-	void Load(obs_data_t *obj);
-	void SetValues(const StringList &values);
-
-private:
-	std::vector<std::weak_ptr<Variable>> _inputVariables;
-	friend class MacroInputSelection;
-	friend class MacroInputEdit;
-};
-
-class MacroInputSelection final : public ListEditor {
-	Q_OBJECT
-
-public:
-	MacroInputSelection(QWidget *parent = nullptr);
-	void SetInputs(const MacroInputVariables &inputs);
-	MacroInputVariables GetInputs() const { return _currentSelection; }
-
-private slots:
-	void Add();
-	void Remove();
-	void Up();
-	void Down();
-	void Clicked(QListWidgetItem *);
-
-private:
-	MacroInputVariables _currentSelection;
-};
-
-class MacroInputEdit final : public QWidget {
-	Q_OBJECT
-
-public:
-	MacroInputEdit(QWidget *parent = nullptr);
-	void SetInputVariablesAndValues(const MacroInputVariables &inputs,
-					const StringList &values);
-	bool HasInputsToSet() const;
-
-signals:
-	void MacroInputValuesChanged(const StringList &);
-
-private:
-	void SetupWidgets();
-
-	MacroInputVariables _variables;
-	StringList _values;
-	QGridLayout *_layout;
-};
-
-} // namespace advss
--- a/lib/macro/macro-list.cpp
+++ b/lib/macro/macro-list.cpp
@@ -7,16 +7,68 @@
 namespace advss {

 MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
-	: ListEditor(parent, reorder),
-	  _allowDuplicates(allowDuplicates)
+	: QWidget(parent),
+	  _list(new QListWidget()),
+	  _add(new QPushButton()),
+	  _remove(new QPushButton()),
+	  _up(new QPushButton()),
+	  _down(new QPushButton()),
+	  _controlsLayout(new QHBoxLayout()),
+	  _allowDuplicates(allowDuplicates),
+	  _reorder(reorder)
 {
+	_add->setMaximumWidth(22);
+	_add->setProperty("themeID",
+			  QVariant(QString::fromUtf8("addIconSmall")));
+	_add->setFlat(true);
+	_remove->setMaximumWidth(22);
+	_remove->setProperty("themeID",
+			     QVariant(QString::fromUtf8("removeIconSmall")));
+	_remove->setFlat(true);
+	_up->setMaximumWidth(22);
+	_up->setProperty("themeID",
+			 QVariant(QString::fromUtf8("upArrowIconSmall")));
+	_up->setFlat(true);
+	_down->setMaximumWidth(22);
+	_down->setProperty("themeID",
+			   QVariant(QString::fromUtf8("downArrowIconSmall")));
+	_down->setFlat(true);
+
+	QWidget::connect(_add, SIGNAL(clicked()), this, SLOT(Add()));
+	QWidget::connect(_remove, SIGNAL(clicked()), this, SLOT(Remove()));
+	QWidget::connect(_up, SIGNAL(clicked()), this, SLOT(Up()));
+	QWidget::connect(_down, SIGNAL(clicked()), this, SLOT(Down()));
+	QWidget::connect(_list, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
+			 this, SLOT(MacroItemClicked(QListWidgetItem *)));
 	QWidget::connect(window(),
 			 SIGNAL(MacroRenamed(const QString &, const QString &)),
 			 this,
 			 SLOT(MacroRename(const QString &, const QString &)));
 	QWidget::connect(window(), SIGNAL(MacroRemoved(const QString &)), this,
 			 SLOT(MacroRemove(const QString &)));
-	UpdateListSize();
+
+	_controlsLayout->addWidget(_add);
+	_controlsLayout->addWidget(_remove);
+	if (reorder) {
+		QFrame *line = new QFrame();
+		line->setFrameShape(QFrame::VLine);
+		line->setFrameShadow(QFrame::Sunken);
+		_controlsLayout->addWidget(line);
+	}
+	_controlsLayout->addWidget(_up);
+	_controlsLayout->addWidget(_down);
+	_controlsLayout->addStretch();
+
+	auto mainLayout = new QVBoxLayout;
+	mainLayout->setContentsMargins(0, 0, 0, 0);
+	mainLayout->addWidget(_list);
+	mainLayout->addLayout(_controlsLayout);
+	setLayout(mainLayout);
+
+	_up->setVisible(reorder);
+	_down->setVisible(reorder);
+
+	SetMacroListSize();
 }

 void MacroList::SetContent(const std::vector<MacroRef> &macros)
@@ -37,15 +89,12 @@ void MacroList::SetContent(const std::vector<MacroRef> &macros)
 			new QListWidgetItem(listEntryName, _list);
 		item->setData(Qt::UserRole, listEntryName);
 	}
-	UpdateListSize();
+	SetMacroListSize();
 }

-QAction *MacroList::AddControl(QWidget *widget, bool addSeperator)
+void MacroList::AddControl(QWidget *widget)
 {
-	if (addSeperator) {
-		_controls->addSeparator();
-	}
-	return _controls->addWidget(widget);
+	_controlsLayout->insertWidget(_controlsLayout->count() - 1, widget);
 }

 int MacroList::CurrentRow()
@@ -73,13 +122,13 @@ void MacroList::MacroRemove(const QString &name)
 		delete _list->item(idx);
 		idx = FindEntry(name.toStdString());
 	}
-	UpdateListSize();
+	SetMacroListSize();
 }

 void MacroList::Add()
 {
 	std::string macroName;
-	bool accepted = MacroSelectionDialog::AskForMacro(macroName);
+	bool accepted = MacroSelectionDialog::AskForMacro(this, macroName);

 	if (!accepted || macroName.empty()) {
 		return;
@@ -93,7 +142,7 @@ void MacroList::Add()
 	auto item =
 		new QListWidgetItem(QString::fromStdString(macroName), _list);
 	item->setData(Qt::UserRole, QString::fromStdString(macroName));
-	UpdateListSize();
+	SetMacroListSize();
 	emit Added(macroName);
 }

@@ -105,7 +154,7 @@ void MacroList::Remove()
 		return;
 	}
 	delete item;
-	UpdateListSize();
+	SetMacroListSize();
 	emit Removed(idx);
 }

@@ -129,10 +178,10 @@ void MacroList::Down()
 	}
 }

-void MacroList::Clicked(QListWidgetItem *item)
+void MacroList::MacroItemClicked(QListWidgetItem *item)
 {
 	std::string macroName;
-	bool accepted = MacroSelectionDialog::AskForMacro(macroName);
+	bool accepted = MacroSelectionDialog::AskForMacro(this, macroName);

 	if (!accepted || macroName.empty()) {
 		return;
@@ -167,4 +216,10 @@ int MacroList::FindEntry(const std::string &macro)
 	return idx;
 }

+void MacroList::SetMacroListSize()
+{
+	SetHeightToContentHeight(_list);
+	adjustSize();
+}
+
 } // namespace advss
--- a/Show More
+++ b/Show More