configuration: Toggle controller vibrations

Allow toggling controller vibrations on/off, this is exactly the same as the setting found in System Settings on hardware.
2020-08-11 15:55:28 -04:00
1208 changed files with 45235 additions and 138526 deletions
@@ -15,5 +15,5 @@ mv "${REV_NAME}-source.tar.xz" $RELEASE_NAME
 7z a "$REV_NAME.7z" $RELEASE_NAME

 # move the compiled archive into the artifacts directory to be uploaded by travis releases
-mv "$ARCHIVE_NAME" "${ARTIFACTS_DIR}/"
-mv "$REV_NAME.7z" "${ARTIFACTS_DIR}/"
+mv "$ARCHIVE_NAME" artifacts/
+mv "$REV_NAME.7z" artifacts/
@@ -2,6 +2,5 @@

 GITDATE="`git show -s --date=short --format='%ad' | sed 's/-//g'`"
 GITREV="`git show -s --format='%h'`"
-ARTIFACTS_DIR="artifacts"

-mkdir -p "${ARTIFACTS_DIR}/"
+mkdir -p artifacts
@@ -8,6 +8,8 @@ fi

 # Default clang-format points to default 3.5 version one
 CLANG_FORMAT=clang-format-10
+ls /usr/bin
+
 $CLANG_FORMAT --version

 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
@@ -1,49 +1,14 @@
 #!/bin/bash -ex

-# Exit on error, rather than continuing with the rest of the script.
-set -e
-
 cd /yuzu

 ccache -s

 mkdir build || true && cd build
-cmake .. -DDISPLAY_VERSION=$1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DCMAKE_INSTALL_PREFIX="/usr"
+cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON

-make -j$(nproc)
+ninja

 ccache -s

 ctest -VV -C Release
-
-make install DESTDIR=AppDir
-rm -vf AppDir/usr/bin/yuzu-cmd AppDir/usr/bin/yuzu-tester
-
-# Download tools needed to build an AppImage
-wget -nc https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-wget -nc https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
-wget -nc https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/AppRun-patched-x86_64
-wget -nc https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so
-# Set executable bit
-chmod 755 \
-    AppRun-patched-x86_64 \
-    exec-x86_64.so \
-    linuxdeploy-x86_64.AppImage \
-    linuxdeploy-plugin-qt-x86_64.AppImage
-
-# Workaround for https://github.com/AppImage/AppImageKit/issues/828
-export APPIMAGE_EXTRACT_AND_RUN=1
-
-mkdir -p AppDir/usr/optional
-mkdir -p AppDir/usr/optional/libstdc++
-mkdir -p AppDir/usr/optional/libgcc_s
-
-# Deploy yuzu's needed dependencies
-./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin qt
-
-# Workaround for building yuzu with GCC 10 but also trying to distribute it to Ubuntu 18.04 et al.
-# See https://github.com/darealshinji/AppImageKit-checkrt
-cp exec-x86_64.so AppDir/usr/optional/exec.so
-cp AppRun-patched-x86_64 AppDir/AppRun
-cp --dereference /usr/lib/x86_64-linux-gnu/libstdc++.so.6 AppDir/usr/optional/libstdc++/libstdc++.so.6
-cp --dereference /lib/x86_64-linux-gnu/libgcc_s.so.1 AppDir/usr/optional/libgcc_s/libgcc_s.so.1
@@ -2,7 +2,6 @@

 . .ci/scripts/common/pre-upload.sh

-APPIMAGE_NAME="yuzu-${GITDATE}-${GITREV}.AppImage"
 REV_NAME="yuzu-linux-${GITDATE}-${GITREV}"
 ARCHIVE_NAME="${REV_NAME}.tar.xz"
 COMPRESSION_FLAGS="-cJvf"
@@ -18,24 +17,4 @@ mkdir "$DIR_NAME"
 cp build/bin/yuzu-cmd "$DIR_NAME"
 cp build/bin/yuzu "$DIR_NAME"

-# Build an AppImage
-cd build
-
-wget -nc https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
-chmod 755 appimagetool-x86_64.AppImage
-
-if [ "${RELEASE_NAME}" = "mainline" ]; then
-    # Generate update information if releasing to mainline
-    ./appimagetool-x86_64.AppImage -u "gh-releases-zsync|yuzu-emu|yuzu-${RELEASE_NAME}|latest|yuzu-*.AppImage.zsync" AppDir "${APPIMAGE_NAME}"
-else
-    ./appimagetool-x86_64.AppImage AppDir "${APPIMAGE_NAME}"
-fi
-cd ..
-
-# Copy the AppImage and update info to the artifacts directory and avoid compressing it
-cp "build/${APPIMAGE_NAME}" "${ARTIFACTS_DIR}/"
-if [ -f "build/${APPIMAGE_NAME}.zsync" ]; then
-    cp "build/${APPIMAGE_NAME}.zsync" "${ARTIFACTS_DIR}/"
-fi
-
 . .ci/scripts/common/post-upload.sh
@@ -5,7 +5,7 @@ cd /yuzu
 ccache -s

 mkdir build || true && cd build
-cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON
+cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_QT_TRANSLATION=ON
 ninja

 ccache -s
@@ -42,8 +42,3 @@ done
 pip3 install pefile
 python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/"
 python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/"
-
-# copy FFmpeg libraries
-EXTERNALS_PATH="$(pwd)/build/externals"
-FFMPEG_DLL_PATH="$(find ${EXTERNALS_PATH} -maxdepth 1 -type d | grep ffmpeg)/bin"
-find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
@@ -4,11 +4,9 @@ parameters:
  version: ''

 steps:
- script: choco install vulkan-sdk
-  displayName: 'Install vulkan-sdk'
 - script: python -m pip install --upgrade pip conan
  displayName: 'Install conan'
- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd ..
+- script: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_UNICORN=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd ..
  displayName: 'Configure CMake'
 - task: MSBuild@1
  displayName: 'Build'
@@ -9,7 +9,6 @@ stages:
  displayName: 'build'
  jobs:
  - job: build
-    timeoutInMinutes: 120
    displayName: 'windows-msvc'
    pool:
      vmImage: windows-2019
@@ -1,21 +1,21 @@
 [submodule "inih"]
    path = externals/inih/inih
-    url = https://github.com/benhoyt/inih.git
+    url = https://github.com/svn2github/inih
 [submodule "cubeb"]
    path = externals/cubeb
    url = https://github.com/kinetiknz/cubeb.git
 [submodule "dynarmic"]
    path = externals/dynarmic
    url = https://github.com/MerryMage/dynarmic.git
+[submodule "unicorn"]
+    path = externals/unicorn
+    url = https://github.com/yuzu-emu/unicorn
 [submodule "soundtouch"]
    path = externals/soundtouch
    url = https://github.com/citra-emu/ext-soundtouch.git
 [submodule "libressl"]
    path = externals/libressl
    url = https://github.com/citra-emu/ext-libressl-portable.git
-[submodule "libusb"]
-	path = externals/libusb/libusb
-	url = https://github.com/libusb/libusb.git
 [submodule "discord-rpc"]
    path = externals/discord-rpc
    url = https://github.com/discordapp/discord-rpc.git
@@ -34,9 +34,9 @@
 [submodule "xbyak"]
    path = externals/xbyak
    url = https://github.com/herumi/xbyak.git
+[submodule "externals/libusb"]
+	path = externals/libusb
+	url = https://github.com/ameerj/libusb
 [submodule "opus"]
 	path = externals/opus/opus
 	url = https://github.com/xiph/opus.git
-[submodule "ffmpeg"]
-	path = externals/ffmpeg
-	url = https://git.ffmpeg.org/ffmpeg.git
@@ -1,10 +0,0 @@
-path_classifiers:
-  library: "externals"
-extraction:
-  cpp:
-    prepare:
-      packages:
-      - "libsdl2-dev"
-      - "qtmultimedia5-dev"
-      - "libtbb-dev"
-      - "libjack-jackd2-dev"
@@ -4,8 +4,16 @@ cd /yuzu
 # override Travis CI unreasonable ccache size
 echo 'max_size = 3.0G' > "$HOME/.ccache/ccache.conf"

+# Dirty hack to trick unicorn makefile into believing we are in a MINGW system
+mv /bin/uname /bin/uname1 && echo -e '#!/bin/sh\necho MINGW64' >> /bin/uname
+chmod +x /bin/uname
+
+# Dirty hack to trick unicorn makefile into believing we have cmd
+echo '' >> /bin/cmd
+chmod +x /bin/cmd
+
 mkdir build && cd build
-cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release
+cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release
 ninja

 # Clean up the dirty hacks
@@ -1,4 +1,4 @@
 #!/bin/bash -ex

 mkdir -p "$HOME/.ccache"
-docker run -e ENABLE_COMPATIBILITY_REPORTING --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/home/yuzu/.ccache yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.travis/linux/docker.sh
+docker run -e ENABLE_COMPATIBILITY_REPORTING --env-file .travis/common/travis-ci.env -v $(pwd):/yuzu -v "$HOME/.ccache":/root/.ccache yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.travis/linux/docker.sh
@@ -3,7 +3,7 @@
 cd /yuzu

 mkdir build && cd build
-cmake .. -G Ninja -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON
+cmake .. -G Ninja -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DUSE_DISCORD_PRESENCE=ON
 ninja

 ccache -s
@@ -4,12 +4,13 @@ set -o pipefail

 export MACOSX_DEPLOYMENT_TARGET=10.14
 export Qt5_DIR=$(brew --prefix)/opt/qt5
+export UNICORNDIR=$(pwd)/externals/unicorn
 export PATH="/usr/local/opt/ccache/libexec:$PATH"

 # TODO: Build using ninja instead of make
 mkdir build && cd build
 cmake --version
-cmake .. -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DUSE_DISCORD_PRESENCE=ON
+cmake .. -DYUZU_USE_BUNDLED_UNICORN=ON -DYUZU_USE_QT_WEB_ENGINE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} -DUSE_DISCORD_PRESENCE=ON
 make -j4

 ccache -s
@@ -18,7 +18,7 @@ CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_QT "Download bundled Qt binaries" ON "EN

 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)

-CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled yuzu" ON "WIN32" OFF)
+option(YUZU_USE_BUNDLED_UNICORN "Build/Download bundled Unicorn" ON)

 option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF)

@@ -26,11 +26,9 @@ option(YUZU_ENABLE_BOXCAT "Enable the Boxcat service, a yuzu high-level implemen

 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)

-option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
+option(ENABLE_VULKAN "Enables Vulkan backend" ON)

-if (NOT ENABLE_WEB_SERVICE)
-    set(YUZU_ENABLE_BOXCAT OFF)
-endif()
+option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)

 # Default to a Release build
 get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
@@ -117,9 +115,6 @@ if (NOT DEFINED ARCHITECTURE)
 endif()
 message(STATUS "Target architecture: ${ARCHITECTURE}")

-if (UNIX)
-    add_definitions(-DYUZU_UNIX=1)
-endif()

 # Configure C++ standard
 # ===========================
@@ -164,14 +159,15 @@ macro(yuzu_find_packages)
    # Capitalization matters here. We need the naming to match the generated paths from Conan
    set(REQUIRED_LIBS
    #    Cmake Pkg Prefix  Version     Conan Pkg
+        "Boost             1.73        boost/1.73.0"
        "Catch2            2.13        catch2/2.13.0"
-        "fmt               7.1         fmt/7.1.2"
+        "fmt               7.0         fmt/7.0.1"
    # can't use until https://github.com/bincrafters/community/issues/1173
        #"libzip            1.5         libzip/1.5.2@bincrafters/stable"
        "lz4               1.8         lz4/1.9.2"
        "nlohmann_json     3.8         nlohmann_json/3.8.0"
        "ZLIB              1.2         zlib/1.2.11"
-        "zstd              1.4         zstd/1.4.8"
+        "zstd              1.4         zstd/1.4.5"
    )

    foreach(PACKAGE ${REQUIRED_LIBS})
@@ -198,22 +194,6 @@ macro(yuzu_find_packages)
    unset(FN_FORCE_REQUIRED)
 endmacro()

-find_package(Boost 1.73.0 COMPONENTS context headers QUIET)
-if (Boost_FOUND)
-    set(Boost_LIBRARIES Boost::boost)
-    # Conditionally add Boost::context only if the active version of the Conan or system Boost package provides it
-    # The old version is missing Boost::context, so we want to avoid adding in that case
-    # The new version requires adding Boost::context to prevent linking issues
-    #
-    # This one is used by Conan on subsequent CMake configures, not the first configure.
-    if (TARGET Boost::context)
-        list(APPEND Boost_LIBRARIES Boost::context)
-    endif()
-else()
-    message(STATUS "Boost 1.73.0 or newer not found, falling back to Conan")
-    list(APPEND CONAN_REQUIRED_LIBS "boost/1.73.0")
-endif()
-
 # Attempt to locate any packages that are required and report the missing ones in CONAN_REQUIRED_LIBS
 yuzu_find_packages()

@@ -230,7 +210,7 @@ if(ENABLE_QT)
    set(QT_PREFIX_HINT)
    if(YUZU_USE_BUNDLED_QT)
        if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
-            set(QT_VER qt-5.12.8-msvc2017_64)
+            set(QT_VER qt-5.12.0-msvc2017_64)
        else()
            message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable YUZU_USE_BUNDLED_QT and provide your own.")
        endif()
@@ -245,7 +225,7 @@ if(ENABLE_QT)
    if (YUZU_USE_QT_WEB_ENGINE)
        find_package(Qt5 COMPONENTS WebEngineCore WebEngineWidgets)
    endif()
-
+	
    if (ENABLE_QT_TRANSLATION)
        find_package(Qt5 REQUIRED COMPONENTS LinguistTools ${QT_PREFIX_HINT})
    endif()
@@ -263,7 +243,7 @@ if(ENABLE_SDL2)
    find_package(SDL2)
    if (NOT SDL2_FOUND)
        # otherwise add this to the list of libraries to install
-        list(APPEND CONAN_REQUIRED_LIBS "sdl2/2.0.14@bincrafters/stable")
+        list(APPEND CONAN_REQUIRED_LIBS "sdl2/2.0.12@bincrafters/stable")
    endif()
 endif()

@@ -283,7 +263,6 @@ if (CONAN_REQUIRED_LIBS)
        libzip:with_openssl=False
        libzip:enable_windows_crypto=False
    )
-
    conan_check(VERSION 1.24.0 REQUIRED)
    # Add the bincrafters remote
    conan_add_remote(NAME bincrafters
@@ -318,17 +297,6 @@ if (CONAN_REQUIRED_LIBS)
    # this time with required, so we bail if its not found.
    yuzu_find_packages(FORCE_REQUIRED)

-    if (NOT Boost_FOUND)
-        find_package(Boost 1.73.0 REQUIRED COMPONENTS context headers)
-        set(Boost_LIBRARIES Boost::boost)
-        # Conditionally add Boost::context only if the active version of the Conan Boost package provides it
-        # The old version is missing Boost::context, so we want to avoid adding in that case
-        # The new version requires adding Boost::context to prevent linking issues
-        if (TARGET Boost::context)
-            list(APPEND Boost_LIBRARIES Boost::context)
-        endif()
-    endif()
-
    # Due to issues with variable scopes in functions, we need to also find_package(qt5) outside of the function
    if(ENABLE_QT)
        list(APPEND CMAKE_MODULE_PATH "${CONAN_QT_ROOT_RELEASE}")
@@ -386,145 +354,85 @@ if (NOT LIBUSB_FOUND)
    set(LIBUSB_LIBRARIES usb)
 endif()

-# List of all FFmpeg components required
-set(FFmpeg_COMPONENTS
-    avcodec
-    avutil
-    swscale)
-
-if (NOT YUZU_USE_BUNDLED_FFMPEG)
-    # Use system installed FFmpeg
-    find_package(FFmpeg REQUIRED COMPONENTS ${FFmpeg_COMPONENTS})
-
-    if (FFmpeg_FOUND)
-        # Overwrite aggregate defines from FFmpeg module to avoid over-linking libraries.
-        # Prevents shipping too many libraries with the AppImage.
-        set(FFmpeg_LIBRARIES "")
-        set(FFmpeg_INCLUDE_DIR "")
-
-        foreach(COMPONENT ${FFmpeg_COMPONENTS})
-            set(FFmpeg_LIBRARIES ${FFmpeg_LIBRARIES} ${FFmpeg_LIBRARY_${COMPONENT}} CACHE PATH "Paths to FFmpeg libraries" FORCE)
-            set(FFmpeg_INCLUDE_DIR ${FFmpeg_INCLUDE_DIR} ${FFmpeg_INCLUDE_${COMPONENT}} CACHE PATH "Path to FFmpeg headers" FORCE)
-        endforeach()
-    else()
-        message(WARNING "FFmpeg not found, falling back to externals")
-        set(YUZU_USE_BUNDLED_FFMPEG ON)
-    endif()
-endif()
-
-if (YUZU_USE_BUNDLED_FFMPEG)
-    if (NOT WIN32)
-        # Build FFmpeg from externals
-        message(STATUS "Using FFmpeg from externals")
-
-        # FFmpeg has source that requires one of nasm or yasm to assemble it.
-        # REQUIRED throws an error if not found here during configuration rather than during compilation.
-        find_program(ASSEMBLER NAMES nasm yasm REQUIRED)
-
-        set(FFmpeg_PREFIX ${PROJECT_SOURCE_DIR}/externals/ffmpeg)
-        set(FFmpeg_BUILD_DIR ${PROJECT_BINARY_DIR}/externals/ffmpeg)
-        set(FFmpeg_MAKEFILE ${FFmpeg_BUILD_DIR}/Makefile)
-        make_directory(${FFmpeg_BUILD_DIR})
-
-        # Read version string from external
-        file(READ ${FFmpeg_PREFIX}/RELEASE FFmpeg_VERSION)
-        set(FFmpeg_FOUND NO)
-        if (NOT FFmpeg_VERSION STREQUAL "")
-            set(FFmpeg_FOUND YES)
-        endif()
-
-        foreach(COMPONENT ${FFmpeg_COMPONENTS})
-            set(FFmpeg_${COMPONENT}_PREFIX "${FFmpeg_BUILD_DIR}/lib${COMPONENT}")
-            set(FFmpeg_${COMPONENT}_LIB_NAME "lib${COMPONENT}.a")
-            set(FFmpeg_${COMPONENT}_LIBRARY "${FFmpeg_${COMPONENT}_PREFIX}/${FFmpeg_${COMPONENT}_LIB_NAME}")
-
-            set(FFmpeg_LIBRARIES
-                ${FFmpeg_LIBRARIES}
-                ${FFmpeg_${COMPONENT}_LIBRARY}
-                CACHE PATH "Paths to FFmpeg libraries" FORCE)
-        endforeach()
-
-        set(FFmpeg_INCLUDE_DIR
-            ${FFmpeg_PREFIX}
-            CACHE PATH "Path to FFmpeg headers" FORCE)
-
-        # `configure` parameters builds only exactly what yuzu needs from FFmpeg
-        # `--disable-{vaapi,vdpau}` is needed to avoid linking issues
-        add_custom_command(
-            OUTPUT
-                ${FFmpeg_MAKEFILE}
-            COMMAND
-                /bin/bash ${FFmpeg_PREFIX}/configure
-                    --disable-avdevice
-                    --disable-avfilter
-                    --disable-avformat
-                    --disable-doc
-                    --disable-everything
-                    --disable-ffmpeg
-                    --disable-ffprobe
-                    --disable-network
-                    --disable-postproc
-                    --disable-swresample
-                    --disable-vaapi
-                    --disable-vdpau
-                    --enable-decoder=h264
-                    --enable-decoder=vp9
-            WORKING_DIRECTORY
-                ${FFmpeg_BUILD_DIR}
-        )
-
-        # Workaround for Ubuntu 18.04's older version of make not being able to call make as a child
-        # with context of the jobserver. Also helps ninja users.
-        execute_process(
-            COMMAND
-                nproc
-            OUTPUT_VARIABLE
-                SYSTEM_THREADS)
-
-        add_custom_command(
-            OUTPUT
-                ${FFmpeg_LIBRARIES}
-            COMMAND
-                make -j${SYSTEM_THREADS}
-            WORKING_DIRECTORY
-                ${FFmpeg_BUILD_DIR}
-        )
-
-        # ALL makes this custom target build every time
-        # but it won't actually build if the DEPENDS parameter is up to date
-        add_custom_target(ffmpeg-build ALL DEPENDS ${FFmpeg_LIBRARIES})
-        add_custom_target(ffmpeg-configure ALL DEPENDS ${FFmpeg_MAKEFILE})
-
-        if (FFmpeg_FOUND)
-            message(STATUS "Found FFmpeg version ${FFmpeg_VERSION}")
-
-            add_dependencies(ffmpeg-build ffmpeg-configure)
-        else()
-            message(FATAL_ERROR "FFmpeg not found")
-        endif()
-    else() # WIN32
-        # Use yuzu FFmpeg binaries
-        set(FFmpeg_EXT_NAME "ffmpeg-4.3.1")
-        set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
-        download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
-        set(FFmpeg_FOUND YES)
-        set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE)
-        set(FFmpeg_LIBRARY_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg library directory" FORCE)
-        set(FFmpeg_DLL_DIR "${FFmpeg_PATH}/bin" CACHE PATH "Path to FFmpeg dll's" FORCE)
-        set(FFmpeg_LIBRARIES
-            ${FFmpeg_LIBRARY_DIR}/swscale.lib
-            ${FFmpeg_LIBRARY_DIR}/avcodec.lib
-            ${FFmpeg_LIBRARY_DIR}/avutil.lib
-            CACHE PATH "Paths to FFmpeg libraries" FORCE)
-    endif()
-endif()
-
-unset(FFmpeg_COMPONENTS)
-
 # Prefer the -pthread flag on Linux.
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

+# If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external
+if (YUZU_USE_BUNDLED_UNICORN)
+    if (MSVC)
+        message(STATUS "unicorn not found, falling back to bundled")
+        # Detect toolchain and platform
+        if ((MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1930) AND ARCHITECTURE_x86_64)
+            set(UNICORN_VER "unicorn-yuzu")
+        else()
+            message(FATAL_ERROR "No bundled Unicorn binaries for your toolchain. Disable YUZU_USE_BUNDLED_UNICORN and provide your own.")
+        endif()
+
+        if (DEFINED UNICORN_VER)
+            download_bundled_external("unicorn/" ${UNICORN_VER} UNICORN_PREFIX)
+        endif()
+
+        if (DEFINED UNICORN_VER)
+            download_bundled_external("unicorn/" ${UNICORN_VER} UNICORN_PREFIX)
+        endif()
+
+        set(UNICORN_FOUND YES)
+        set(LIBUNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers" FORCE)
+        set(LIBUNICORN_LIBRARY "${UNICORN_PREFIX}/lib/x64/unicorn_dynload.lib" CACHE PATH "Path to Unicorn library" FORCE)
+        set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/lib/x64/" CACHE PATH "Path to unicorn.dll" FORCE)
+    else()
+        message(STATUS "unicorn not found, falling back to externals")
+        if (MINGW)
+            set(UNICORN_LIB_NAME "unicorn.a")
+        else()
+            set(UNICORN_LIB_NAME "libunicorn.a")
+        endif()
+
+        set(UNICORN_FOUND YES)
+        set(UNICORN_PREFIX ${PROJECT_SOURCE_DIR}/externals/unicorn)
+        set(LIBUNICORN_LIBRARY "${UNICORN_PREFIX}/${UNICORN_LIB_NAME}" CACHE PATH "Path to Unicorn library" FORCE)
+        set(LIBUNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers" FORCE)
+        set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/" CACHE PATH "Path to unicorn dynamic library" FORCE)
+
+        find_package(PythonInterp 2.7 REQUIRED)
+
+        if (MINGW)
+            # Intentionally call the unicorn makefile directly instead of using make.sh so that we can override the
+            # UNAME_S makefile variable to MINGW. This way we don't have to hack at the uname binary to build
+            # Additionally, overriding DO_WINDOWS_EXPORT prevents unicorn from patching the static unicorn.a by using msvc and cmd,
+            # which are both things we don't have in a mingw cross compiling environment.
+            add_custom_command(OUTPUT ${LIBUNICORN_LIBRARY}
+                COMMAND ${CMAKE_COMMAND} -E env UNICORN_ARCHS="aarch64" PYTHON="${PYTHON_EXECUTABLE}" CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-gcc-ar RANLIB=x86_64-w64-mingw32-gcc-ranlib make UNAME_S=MINGW DO_WINDOWS_EXPORT=0
+                WORKING_DIRECTORY ${UNICORN_PREFIX}
+            )
+        else()
+            add_custom_command(OUTPUT ${LIBUNICORN_LIBRARY}
+                COMMAND ${CMAKE_COMMAND} -E env UNICORN_ARCHS="aarch64" PYTHON="${PYTHON_EXECUTABLE}" /bin/sh make.sh macos-universal-no
+                WORKING_DIRECTORY ${UNICORN_PREFIX}
+            )
+        endif()
+
+        # ALL makes this custom target build every time
+        # but it won't actually build if LIBUNICORN_LIBRARY is up to date
+        add_custom_target(unicorn-build ALL
+            DEPENDS ${LIBUNICORN_LIBRARY}
+        )
+        unset(UNICORN_LIB_NAME)
+    endif()
+else()
+    find_package(Unicorn REQUIRED)
+endif()
+
+if (UNICORN_FOUND)
+    add_library(unicorn INTERFACE)
+    add_dependencies(unicorn unicorn-build)
+    target_link_libraries(unicorn INTERFACE "${LIBUNICORN_LIBRARY}")
+    target_include_directories(unicorn INTERFACE "${LIBUNICORN_INCLUDE_DIR}")
+else()
+    message(FATAL_ERROR "Could not find or build unicorn which is required.")
+endif()
+
 # Platform-specific library requirements
 # ======================================

@@ -1,6 +0,0 @@
-function(copy_yuzu_FFmpeg_deps target_dir)
-    include(WindowsCopyFiles)
-    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
-    file(READ "${FFmpeg_PATH}/requirements.txt" FFmpeg_REQUIRED_DLLS)
-    windows_copy_files(${target_dir} ${FFmpeg_DLL_DIR} ${DLL_DEST} ${FFmpeg_REQUIRED_DLLS})
-endfunction(copy_yuzu_FFmpeg_deps)
@@ -0,0 +1,9 @@
+function(copy_yuzu_unicorn_deps target_dir)
+    include(WindowsCopyFiles)
+    set(DLL_DEST "${CMAKE_BINARY_DIR}/bin/$<CONFIG>/")
+    windows_copy_files(${target_dir} ${UNICORN_DLL_DIR} ${DLL_DEST}
+        libgcc_s_seh-1.dll
+        libwinpthread-1.dll
+        unicorn.dll
+    )
+endfunction(copy_yuzu_unicorn_deps)
@@ -30,10 +30,11 @@ If you want to contribute to the user interface translation, please check out th

 * __Windows__: [Windows Build](https://github.com/yuzu-emu/yuzu/wiki/Building-For-Windows)
 * __Linux__: [Linux Build](https://github.com/yuzu-emu/yuzu/wiki/Building-For-Linux)
+* __macOS__: [macOS Build](https://github.com/yuzu-emu/yuzu/wiki/Building-for-macOS)


 ### Support
-We happily accept monetary donations, or donated games and hardware. Please see our [donations page](https://yuzu-emu.org/donate/) for more information on how you can contribute to yuzu. Any donations received will go towards things like:
+We happily accept monetary donations or donated games and hardware. Please see our [donations page](https://yuzu-emu.org/donate/) for more information on how you can contribute to yuzu. Any donations received will go towards things like:
 * Switch consoles to explore and reverse-engineer the hardware
 * Switch games for testing, reverse-engineering, and implementing new features
 * Web hosting and infrastructure setup
@@ -1,34 +0,0 @@
-<RCC>
-  <qresource prefix="controller">
-    <file alias="applet_dual_joycon">applet_dual_joycon.png</file>
-    <file alias="applet_dual_joycon_dark">applet_dual_joycon_dark.png</file>	
-    <file alias="applet_dual_joycon_midnight">applet_dual_joycon_midnight.png</file>	
-    <file alias="applet_handheld">applet_handheld.png</file>
-    <file alias="applet_handheld_dark">applet_handheld_dark.png</file>	
-    <file alias="applet_handheld_midnight">applet_handheld_midnight.png</file>
-    <file alias="applet_pro_controller">applet_pro_controller.png</file>
-    <file alias="applet_pro_controller_dark">applet_pro_controller_dark.png</file>
-    <file alias="applet_pro_controller_midnight">applet_pro_controller_midnight.png</file>
-    <file alias="applet_joycon_left">applet_single_joycon_left.png</file>
-    <file alias="applet_joycon_left_dark">applet_single_joycon_left_dark.png</file>
-    <file alias="applet_joycon_left_midnight">applet_single_joycon_left_midnight.png</file>
-    <file alias="applet_joycon_right">applet_single_joycon_right.png</file>
-    <file alias="applet_joycon_right_dark">applet_single_joycon_right_dark.png</file>
-    <file alias="applet_joycon_right_midnight">applet_single_joycon_right_midnight.png</file>
-    <file alias="applet_dual_joycon_disabled">applet_dual_joycon_disabled.png</file>
-    <file alias="applet_dual_joycon_dark_disabled">applet_dual_joycon_dark_disabled.png</file>
-    <file alias="applet_dual_joycon_midnight_disabled">applet_dual_joycon_midnight_disabled.png</file>
-    <file alias="applet_handheld_disabled">applet_handheld_disabled.png</file>
-    <file alias="applet_handheld_dark_disabled">applet_handheld_dark_disabled.png</file>
-    <file alias="applet_handheld_midnight_disabled">applet_handheld_midnight_disabled.png</file>
-    <file alias="applet_pro_controller_disabled">applet_pro_controller_disabled.png</file>
-    <file alias="applet_pro_controller_dark_disabled">applet_pro_controller_dark_disabled.png</file>
-    <file alias="applet_pro_controller_midnight_disabled">applet_pro_controller_midnight_disabled.png</file>
-    <file alias="applet_joycon_left_disabled">applet_single_joycon_left_disabled.png</file>
-    <file alias="applet_joycon_left_dark_disabled">applet_single_joycon_left_dark_disabled.png</file>
-    <file alias="applet_joycon_left_midnight_disabled">applet_single_joycon_left_midnight_disabled.png</file>
-    <file alias="applet_joycon_right_disabled">applet_single_joycon_right_disabled.png</file>
-    <file alias="applet_joycon_right_dark_disabled">applet_single_joycon_right_dark_disabled.png</file>
-    <file alias="applet_joycon_right_midnight_disabled">applet_single_joycon_right_midnight_disabled.png</file>
-  </qresource>
-</RCC>
@@ -5,7 +5,6 @@ Icon Name | License | Origin/Author
 qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -13,7 +12,6 @@ qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -21,7 +19,6 @@ qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
 qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io
 qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=colorful_dark
 Comment=Colorful theme (Dark style)
-Inherits=colorful
+Inherits=default
 Directories=16x16
 
 [16x16]
@@ -2,7 +2,6 @@
    <qresource prefix="icons/colorful_dark">
        <file alias="index.theme">icons/index.theme</file>
        <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
        <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
        <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
        <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=colorful_midnight_blue
 Comment=Colorful theme (Midnight Blue style)
-Inherits=colorful
+Inherits=default
 Directories=16x16

 [16x16]
@@ -2,7 +2,6 @@
    <qresource prefix="icons/colorful_midnight_blue">
        <file alias="index.theme">icons/index.theme</file>
        <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
        <file alias="48x48/bad_folder.png">../colorful/icons/48x48/bad_folder.png</file>
        <file alias="48x48/chip.png">../colorful/icons/48x48/chip.png</file>
        <file alias="48x48/folder.png">../colorful/icons/48x48/folder.png</file>
@@ -4,7 +4,6 @@
        <file alias="16x16/checked.png">icons/16x16/checked.png</file>
        <file alias="16x16/failed.png">icons/16x16/failed.png</file>
        <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-        <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
        <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
        <file alias="48x48/chip.png">icons/48x48/chip.png</file>
        <file alias="48x48/folder.png">icons/48x48/folder.png</file>
@@ -1,7 +1,3 @@
-QAbstractSpinBox {
-    min-height: 19px;
-}
-
 QPushButton#TogglableStatusBarButton {
    color: #959595;
    border: 1px solid transparent;
@@ -34,250 +30,6 @@ QPushButton#RendererStatusBarButton:checked {
    color: #e85c00;
 }

-QPushButton#RendererStatusBarButton:!checked {
+QPushButton#RendererStatusBarButton:!checked{
    color: #0066ff;
 }
-
-QPushButton#buttonRefreshDevices {
-    min-width: 21px;
-    min-height: 21px;
-    max-width: 21px;
-    max-height: 21px;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-    background-color: #f5f5f5;
-}
-
-QWidget#topControllerApplet {
-    border-bottom: 1px solid #828790
-}
-
-QWidget#bottomPerGameInput,
-QWidget#bottomControllerApplet {
-    border-top: 1px solid #828790
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-    background-color: #fff;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-    width: 120px;
-}
-
-QWidget#connectedControllers {
-    background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-    border: none;
-    background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-    border: 1px solid #828790;
-    border-radius: 3px;
-    padding: 0px;
-    min-height: 98px;
-    max-height: 98px;
-}
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-    border: 1px solid #d9d9d9;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top left;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 1px;
-    margin-left: 0px;
-    margin-right: -4px;
-    margin-bottom: 4px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-    width: 6px;
-    height: 6px;
-    margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 12px;
-    height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QGroupBox#groupPlayer1Connected::indicator,
-QGroupBox#groupPlayer2Connected::indicator,
-QGroupBox#groupPlayer3Connected::indicator,
-QGroupBox#groupPlayer4Connected::indicator,
-QGroupBox#groupPlayer5Connected::indicator,
-QGroupBox#groupPlayer6Connected::indicator,
-QGroupBox#groupPlayer7Connected::indicator,
-QGroupBox#groupPlayer8Connected::indicator {
-    width: 16px;
-    height: 16px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: #39ff14;
-    image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: transparent;
-    image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-    background: transparent;
-}
@@ -2,7 +2,6 @@
  <qresource prefix="icons/qdarkstyle">
    <file alias="index.theme">icons/index.theme</file>
    <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
    <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
    <file alias="48x48/chip.png">icons/48x48/chip.png</file>
    <file alias="48x48/folder.png">icons/48x48/folder.png</file>
@@ -52,6 +51,6 @@
    <file>rc/radio_unchecked.png</file>
  </qresource>
  <qresource prefix="qdarkstyle">
-    <file>style.qss</file>
+      <file>style.qss</file>
  </qresource>
 </RCC>
@@ -40,8 +40,8 @@ QCheckBox:disabled {

 QCheckBox::indicator,
 QGroupBox::indicator {
-    width: 16px;
-    height: 16px;
+    width: 18px;
+    height: 18px;
 }

 QGroupBox::indicator {
@@ -99,19 +99,12 @@ QGroupBox::indicator:unchecked:disabled {
 }

 QRadioButton {
-    color: #eff0f1;
-    spacing: 3px;
-    padding: 0px;
-    border: none;
+    spacing: 5px;
    outline: none;
+    color: #eff0f1;
    margin-bottom: 2px;
 }

-QGroupBox QRadioButton {
-    padding-left: 0px;
-    padding-right: 7px;
-}
-
 QRadioButton:disabled {
    color: #76797C;
 }
@@ -529,12 +522,13 @@ QToolButton#qt_toolbar_ext_button {

 QPushButton {
    color: #eff0f1;
-    border: 1px solid #54575B;
+    border-width: 1px;
+    border-color: #54575B;
+    border-style: solid;
+    padding: 6px 4px;
    border-radius: 2px;
-    padding: 5px 0px 5px 0px;
    outline: none;
    min-width: 100px;
-    min-height: 13px;
    background-color: #232629;
 }

@@ -559,9 +553,8 @@ QComboBox {
    selection-background-color: #3daee9;
    border: 1px solid #54575B;
    border-radius: 2px;
-    padding: 0px 4px 0px 4px;
-    min-width: 60px;
-    min-height: 23px;
+    padding: 4px 6px;
+    min-width: 75px;
    background-color: #232629;
 }

@@ -615,26 +608,26 @@ QComboBox::down-arrow:focus {
 }

 QAbstractSpinBox {
+    padding: 4px 6px;
    border: 1px solid #54575B;
    background-color: #232629;
    color: #eff0f1;
    border-radius: 2px;
-    min-width: 52px;
-    min-height: 23px;
+    min-width: 75px;
 }

 QAbstractSpinBox:up-button {
    background-color: transparent;
    subcontrol-origin: border;
    subcontrol-position: center right;
-    left: -2px;
+    left: -6px;
 }

 QAbstractSpinBox:down-button {
    background-color: transparent;
    subcontrol-origin: border;
    subcontrol-position: center left;
-    right: -2px;
+    right: -6px;
 }

 QAbstractSpinBox::up-arrow,
@@ -1244,7 +1237,6 @@ QPlainTextEdit:disabled {
    background-color: #2b2e31;
 }

-
 QPushButton#TogglableStatusBarButton {
    min-width: 0px;
    color: #656565;
@@ -1279,288 +1271,6 @@ QPushButton#RendererStatusBarButton:checked {
    color: #e85c00;
 }

-QPushButton#RendererStatusBarButton:!checked {
-    color: #00ccdd;
-}
-
-QPushButton#buttonRefreshDevices {
-    min-width: 23px;
-    min-height: 23px;
-    max-width: 23px;
-    max-height: 23px;
-    padding: 0px 0px;
-}
-
-QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange,
-QSpinBox#vibrationSpinPlayer1,
-QSpinBox#vibrationSpinPlayer2,
-QSpinBox#vibrationSpinPlayer3,
-QSpinBox#vibrationSpinPlayer4,
-QSpinBox#vibrationSpinPlayer5,
-QSpinBox#vibrationSpinPlayer6,
-QSpinBox#vibrationSpinPlayer7,
-QSpinBox#vibrationSpinPlayer8 {
-    min-width: 68px;
-}
-
-QDialog#ConfigureVibration QGroupBox::indicator,
-QGroupBox#motionGroup::indicator,
-QGroupBox#vibrationGroup::indicator {
-    margin-left: 0px;
-}
-
-QDialog#ConfigureVibration QGroupBox::title,
-QGroupBox#motionGroup::title,
-QGroupBox#vibrationGroup::title {
-    spacing: 2px;
-    padding-left: 1px;
-    padding-right: 1px;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-    background-color: #232629;
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-    background-color: #31363b;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-    width: 120px;
-}
-
-QWidget#connectedControllers {
-    background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-    border: none;
-    background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-    border: 1px solid #76797c;
-    border-radius: 3px;
-    padding: 0px;
-    min-height: 98px;
-    max-height: 98px;
-    margin-top: 0px;
-}
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-    border: 1px solid #54575b;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-    subcontrol-origin: margin;
-    subcontrol-position: top left;
-    padding-left: 0px;
-    padding-right: 0px;
-    padding-top: 1px;
-    margin-left: -2px;
-    margin-right: -4px;
-    margin-bottom: 6px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-    spacing: 0px;
-}
-
-QWidget#Player1LEDs,
-QWidget#Player2LEDs,
-QWidget#Player3LEDs,
-QWidget#Player4LEDs,
-QWidget#Player5LEDs,
-QWidget#Player6LEDs,
-QWidget#Player7LEDs,
-QWidget#Player8LEDs {
-    background: transparent;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox {
-    spacing: 0px;
-    margin-bottom: 0px;
-    margin-right: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-    width: 6px;
-    height: 6px;
-    margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 12px;
-    height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-    width: 14px;
-    height: 14px;
-}
-
-QGroupBox#groupPlayer1Connected::indicator,
-QGroupBox#groupPlayer2Connected::indicator,
-QGroupBox#groupPlayer3Connected::indicator,
-QGroupBox#groupPlayer4Connected::indicator,
-QGroupBox#groupPlayer5Connected::indicator,
-QGroupBox#groupPlayer6Connected::indicator,
-QGroupBox#groupPlayer7Connected::indicator,
-QGroupBox#groupPlayer8Connected::indicator {
-    width: 16px;
-    height: 16px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: #39ff14;
-    image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-    border-radius: 2px;
-    border: 1px solid #929192;
-    background: transparent;
-    image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-    background: transparent;
-}
-
-/* touchscreen mapping widget */
-TouchScreenPreview {
-    qproperty-dotHighlightColor: #3daee9;
+QPushButton#RendererStatusBarButton:!checked{
+   color: #00ccdd;
 }
@@ -2,7 +2,6 @@
  <qresource prefix="icons/qdarkstyle_midnight_blue">
    <file alias="index.theme">icons/index.theme</file>
    <file alias="16x16/lock.png">icons/16x16/lock.png</file>
-    <file alias="16x16/view-refresh.png">icons/16x16/view-refresh.png</file>
    <file alias="48x48/bad_folder.png">icons/48x48/bad_folder.png</file>
    <file alias="48x48/chip.png">icons/48x48/chip.png</file>
    <file alias="48x48/folder.png">icons/48x48/folder.png</file>
@@ -221,6 +220,6 @@
    <file>rc/window_undock_pressed@2x.png</file>
  </qresource>
  <qresource prefix="qdarkstyle_midnight_blue">
-    <file>style.qss</file>
+      <file>style.qss</file>
  </qresource>
 </RCC>
@@ -138,6 +138,8 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar

 --------------------------------------------------------------------------- */
 QStatusBar {
+  border: 1px solid #32414B;
+  /* Fixes Spyder #9120, #9121 */
  background: #32414B;
  /* Fixes #205, white vertical borders separating items */
 }
@@ -159,7 +161,6 @@ QStatusBar QToolTip {
 QStatusBar QLabel {
  /* Fixes Spyder #9120, #9121 */
  background: transparent;
-  padding: 0px;
 }

 /* QCheckBox --------------------------------------------------------------
@@ -172,8 +173,8 @@ QCheckBox {
  color: #F0F0F0;
  spacing: 4px;
  outline: none;
-  padding-top: 2px;
-  padding-bottom: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
 }

 QCheckBox:focus {
@@ -238,16 +239,18 @@ QGroupBox {
  font-weight: bold;
  border: 1px solid #32414B;
  border-radius: 4px;
-  margin-top: 12px;
-  padding: 2px;
+  padding: 4px;
+  margin-top: 16px;
 }

 QGroupBox::title {
  subcontrol-origin: margin;
  subcontrol-position: top left;
+  left: 3px;
  padding-left: 3px;
  padding-right: 5px;
-  padding-top: 2px;
+  padding-top: 8px;
+  padding-bottom: 16px;
 }

 QGroupBox::indicator {
@@ -298,11 +301,6 @@ QRadioButton {
  outline: none;
 }

-QGroupBox QRadioButton {
-  padding-left: 0px;
-  padding-right: 7px;
-}
-
 QRadioButton:focus {
  border: none;
 }
@@ -326,6 +324,7 @@ QRadioButton QWidget {
 QRadioButton::indicator {
  border: none;
  outline: none;
+  margin-left: 4px;
  height: 16px;
  width: 16px;
 }
@@ -368,19 +367,28 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
 --------------------------------------------------------------------------- */
 QMenuBar {
  background-color: #32414B;
+  padding: 2px;
+  border: 1px solid #19232D;
  color: #F0F0F0;
 }

+QMenuBar:focus {
+  border: 1px solid #148CD2;
+}
+
 QMenuBar::item {
  background: transparent;
+  padding: 4px;
 }

 QMenuBar::item:selected {
+  padding: 4px;
  background: transparent;
  border: 0px solid #32414B;
 }

 QMenuBar::item:pressed {
+  padding: 4px;
  border: 0px solid #32414B;
  background-color: #148CD2;
  color: #F0F0F0;
@@ -388,7 +396,6 @@ QMenuBar::item:pressed {
  padding-bottom: 0px;
 }

-
 /* QMenu ------------------------------------------------------------------

 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
@@ -475,7 +482,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox

 --------------------------------------------------------------------------- */
 QAbstractItemView {
-  alternate-background-color: #1f2933;
+  alternate-background-color: #19232D;
  color: #F0F0F0;
  border: 1px solid #32414B;
  border-radius: 4px;
@@ -494,13 +501,13 @@ QAbstractScrollArea {
  background-color: #19232D;
  border: 1px solid #32414B;
  border-radius: 4px;
+  padding: 2px;
  /* fix #159 */
  min-height: 1.25em;
  /* fix #159 */
  color: #F0F0F0;
 }

-
 QAbstractScrollArea:disabled {
  color: #787878;
 }
@@ -789,27 +796,31 @@ QAbstractSpinBox {
  background-color: #19232D;
  border: 1px solid #32414B;
  color: #F0F0F0;
+  /* This fixes 103, 111 */
+  padding-top: 2px;
+  /* This fixes 103, 111 */
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
  border-radius: 4px;
-  min-height: 19px;
+  /* min-width: 5px; removed to fix 109 */
 }

 QAbstractSpinBox:up-button {
-  background-color: #505F69;
+  background-color: transparent #19232D;
  subcontrol-origin: border;
  subcontrol-position: top right;
  border-left: 1px solid #32414B;
-  border-top: 1px solid #32414B;
-  border-right: 1px solid #32414B;
-  border-top-right-radius: 4px;
+  border-bottom: 1px solid #32414B;
  border-top-left-radius: 0;
  border-bottom-left-radius: 0;
-  margin: 0px;
+  margin: 1px;
  width: 12px;
-  margin-bottom: 0px;
+  margin-bottom: -1px;
 }

 QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(":/qss_icons/rc/up_arrow.png");
+  image: url(":/qss_icons/rc/arrow_up_disabled.png");
  height: 8px;
  width: 8px;
 }
@@ -819,23 +830,20 @@ QAbstractSpinBox::up-arrow:hover {
 }

 QAbstractSpinBox:down-button {
-  background-color: #505F69;
+  background-color: transparent #19232D;
  subcontrol-origin: border;
  subcontrol-position: bottom right;
  border-left: 1px solid #32414B;
-  border-right: 1px solid #32414B;
-  border-bottom: 1px solid #32414B;
  border-top: 1px solid #32414B;
  border-top-left-radius: 0;
  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 4px;
-  margin: 0px;
+  margin: 1px;
  width: 12px;
-  margin-top: 0px;
+  margin-top: -1px;
 }

 QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(":/qss_icons/rc/down_arrow.png");
+  image: url(":/qss_icons/rc/arrow_down_disabled.png");
  height: 8px;
  width: 8px;
 }
@@ -995,11 +1003,10 @@ QPushButton {
  border: 1px solid #32414B;
  color: #F0F0F0;
  border-radius: 4px;
-  padding: 3px 0px 3px 0px;
+  padding: 3px;
  outline: none;
  /* Issue #194 - Special case of QPushButton inside dialogs, for better UI */
  min-width: 80px;
-  min-height: 13px;
 }

 QPushButton:disabled {
@@ -1007,14 +1014,14 @@ QPushButton:disabled {
  border: 1px solid #32414B;
  color: #787878;
  border-radius: 4px;
-  padding: 3px 0px 3px 0px;
+  padding: 3px;
 }

 QPushButton:checked {
  background-color: #32414B;
  border: 1px solid #32414B;
  border-radius: 4px;
-  padding: 3px 0px 3px 0px;
+  padding: 3px;
  outline: none;
 }

@@ -1023,7 +1030,7 @@ QPushButton:checked:disabled {
  border: 1px solid #32414B;
  color: #787878;
  border-radius: 4px;
-  padding: 3px 0px 3px 0px;
+  padding: 3px;
  outline: none;
 }

@@ -1192,19 +1199,24 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox

 --------------------------------------------------------------------------- */
 QComboBox {
-  background-color: #0f1922;
  border: 1px solid #32414B;
  border-radius: 4px;
  selection-background-color: #1464A0;
-  padding: 0px 4px 0px 4px;
-  min-width: 60px;
-  min-height: 19px;
+  padding-left: 4px;
+  padding-right: 36px;
+  /* 4 + 16*2 See scrollbar size */
+  /* Fixes #103, #111 */
+  min-height: 1.5em;
+  /* padding-top: 2px;     removed to fix #132 */
+  /* padding-bottom: 2px;  removed to fix #132 */
+  /* min-width: 75px;      removed to fix #109 */
+  /* Needed to remove indicator - fix #132 */
 }

 QComboBox QAbstractItemView {
  border: 1px solid #32414B;
  border-radius: 0;
-  background-color: #0f1922;
+  background-color: #19232D;
  selection-background-color: #1464A0;
 }

@@ -1257,6 +1269,10 @@ QComboBox::item:alternate {
  background: #19232D;
 }

+QComboBox::item:checked {
+  font-weight: bold;
+}
+
 QComboBox::item:selected {
  border: 0px solid transparent;
 }
@@ -1269,12 +1285,7 @@ QComboBox::drop-down {
 }

 QComboBox::down-arrow {
-  image: url(":/qss_icons/rc/down_arrow.png");
-  background-color: #505F69;
-  padding: 6px 2px;
-  border: 1px solid #32414B;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
+  image: url(":/qss_icons/rc/arrow_down_disabled.png");
  height: 8px;
  width: 8px;
 }
@@ -1548,12 +1559,12 @@ QTabBar::tab:right:!selected {
 QTabBar::tab:top {
  background-color: #32414B;
  color: #F0F0F0;
-  min-width: 36px;
  margin-left: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: 4px;
+  padding-right: 4px;
  padding-top: 2px;
  padding-bottom: 2px;
+  min-width: 5px;
  border-bottom: 3px solid #32414B;
  border-top-left-radius: 3px;
  border-top-right-radius: 3px;
@@ -1577,16 +1588,16 @@ QTabBar::tab:top:!selected:hover {

 QTabBar::tab:bottom {
  color: #F0F0F0;
-  min-width: 36px;
  border-top: 3px solid #32414B;
  background-color: #32414B;
  margin-left: 2px;
-  padding-left: 8px;
-  padding-right: 8px;
+  padding-left: 4px;
+  padding-right: 4px;
  padding-top: 2px;
  padding-bottom: 2px;
  border-bottom-left-radius: 3px;
  border-bottom-right-radius: 3px;
+  min-width: 5px;
 }

 QTabBar::tab:bottom:selected {
@@ -1741,6 +1752,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview

 --------------------------------------------------------------------------- */
+QTreeView:branch:selected, QTreeView:branch:hover {
+  background: url(":/qss_icons/rc/transparent.png");
+}
+
+QTreeView:branch:has-siblings:!adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_line.png") 0;
+}
+
+QTreeView:branch:has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_more.png") 0;
+}
+
+QTreeView:branch:!has-children:!has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/rc/branch_end.png") 0;
+}

 QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
  border-image: none;
@@ -1874,21 +1900,21 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview

 --------------------------------------------------------------------------- */
 QHeaderView {
-  background-color: #19232D;
-  border: 0px transparent #19232D;
+  background-color: #32414B;
+  border: 0px transparent #32414B;
  padding: 0px;
  margin: 0px;
  border-radius: 0px;
 }

 QHeaderView:disabled {
-  background-color: #19232D;
-  border: 1px transparent #19232D;
+  background-color: #32414B;
+  border: 1px transparent #32414B;
  padding: 2px;
 }

 QHeaderView::section {
-  background-color: #19232D;
+  background-color: #32414B;
  color: #F0F0F0;
  padding: 2px;
  border-radius: 0px;
@@ -1908,11 +1934,11 @@ QHeaderView::section:checked:disabled {
 QHeaderView::section::horizontal {
  padding-left: 4px;
  padding-right: 4px;
-  border-left: 1px solid #32414B;
+  border-left: 1px solid #19232D;
 }

 QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
-  border-left: 1px solid #19232D;
+  border-left: 1px solid #32414B;
 }

 QHeaderView::section::horizontal:disabled {
@@ -1922,7 +1948,7 @@ QHeaderView::section::horizontal:disabled {
 QHeaderView::section::vertical {
  padding-left: 4px;
  padding-right: 4px;
-  border-top: 1px solid #32414B;
+  border-top: 1px solid #19232D;
 }

 QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
@@ -1936,7 +1962,7 @@ QHeaderView::section::vertical:disabled {
 QHeaderView::down-arrow {
  /* Those settings (border/width/height/background-color) solve bug */
  /* transparent arrow background and size */
-  background-color: #19232D;
+  background-color: #32414B;
  border: none;
  height: 12px;
  width: 12px;
@@ -1946,7 +1972,7 @@ QHeaderView::down-arrow {
 }

 QHeaderView::up-arrow {
-  background-color: #19232D;
+  background-color: #32414B;
  border: none;
  height: 12px;
  width: 12px;
@@ -2146,340 +2172,3 @@ PlotWidget {
  /* Fix cut labels in plots #134 */
  padding: 0px;
 }
-
-
-QPushButton#TogglableStatusBarButton {
-  min-width: 0px;
-  color: #656565;
-  border: 1px solid transparent;
-  background-color: transparent;
-  padding: 0px 3px 0px 3px;
-  text-align: center;
-}
-
-QPushButton#TogglableStatusBarButton:checked {
-  color: #ffffff;
-}
-
-QPushButton#TogglableStatusBarButton:hover {
-  border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton {
-  min-width: 0px;
-  color: #656565;
-  border: 1px solid transparent;
-  background-color: transparent;
-  padding: 0px 3px 0px 3px;
-  text-align: center;
-}
-
-QPushButton#RendererStatusBarButton:hover {
-  border: 1px solid #76797C;
-}
-
-QPushButton#RendererStatusBarButton:checked {
-  color: #e85c00;
-}
-
-QPushButton#RendererStatusBarButton:!checked {
-  color: #00ccdd;
-}
-
-QPushButton#buttonRefreshDevices {
-  min-width: 19px;
-  min-height: 19px;
-  max-width: 19px;
-  max-height: 19px;
-  padding: 0px 0px;
-}
-
-QSpinBox#spinboxLStickRange,
-QSpinBox#spinboxRStickRange,
-QSpinBox#vibrationSpinPlayer1,
-QSpinBox#vibrationSpinPlayer2,
-QSpinBox#vibrationSpinPlayer3,
-QSpinBox#vibrationSpinPlayer4,
-QSpinBox#vibrationSpinPlayer5,
-QSpinBox#vibrationSpinPlayer6,
-QSpinBox#vibrationSpinPlayer7,
-QSpinBox#vibrationSpinPlayer8 {
-  min-width: 68px;
-}
-
-QDialog#ConfigureVibration QGroupBox::indicator,
-QGroupBox#motionGroup::indicator,
-QGroupBox#vibrationGroup::indicator {
-  margin-left: 0px;
-}
-
-QDialog#ConfigureVibration QGroupBox,
-QWidget#bottomPerGameInput QGroupBox#motionGroup,
-QWidget#bottomPerGameInput QGroupBox#vibrationGroup,
-QWidget#bottomPerGameInput QGroupBox#inputConfigGroup {
-  padding: 0px;
-}
-
-QDialog#ConfigureVibration QGroupBox::title,
-QGroupBox#motionGroup::title,
-QGroupBox#vibrationGroup::title {
-  spacing: 2px;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-QListWidget#selectorList {
-  background-color: #0f1922;
-}
-
-QSpinBox,
-QLineEdit,
-QTreeView#hotkey_list,
-QScrollArea#scrollArea QTreeView {
-  background-color: #0f1922;
-}
-
-QWidget#bottomPerGameInput,
-QWidget#topControllerApplet,
-QWidget#bottomControllerApplet,
-QGroupBox#groupPlayer1Connected:checked,
-QGroupBox#groupPlayer2Connected:checked,
-QGroupBox#groupPlayer3Connected:checked,
-QGroupBox#groupPlayer4Connected:checked,
-QGroupBox#groupPlayer5Connected:checked,
-QGroupBox#groupPlayer6Connected:checked,
-QGroupBox#groupPlayer7Connected:checked,
-QGroupBox#groupPlayer8Connected:checked {
-  background-color: #0f1922;
-}
-
-QWidget#topPerGameInput,
-QWidget#middleControllerApplet {
-  background-color: #19232d;
-}
-
-QWidget#topPerGameInput QComboBox,
-QWidget#middleControllerApplet QComboBox {
-  width: 120px;
-}
-
-QWidget#connectedControllers {
-  background: transparent;
-}
-
-QWidget#playersSupported,
-QWidget#controllersSupported,
-QWidget#controllerSupported1,
-QWidget#controllerSupported2,
-QWidget#controllerSupported3,
-QWidget#controllerSupported4,
-QWidget#controllerSupported5,
-QWidget#controllerSupported6 {
-  border: none;
-  background: transparent;
-}
-
-QGroupBox#groupPlayer1Connected,
-QGroupBox#groupPlayer2Connected,
-QGroupBox#groupPlayer3Connected,
-QGroupBox#groupPlayer4Connected,
-QGroupBox#groupPlayer5Connected,
-QGroupBox#groupPlayer6Connected,
-QGroupBox#groupPlayer7Connected,
-QGroupBox#groupPlayer8Connected {
-  border: 1px solid #76797c;
-  border-radius: 3px;
-  padding: 0px;
-  min-height: 98px;
-  max-height: 98px;
-  margin-top: 0px;
-}
-
-
-QGroupBox#groupPlayer1Connected:unchecked,
-QGroupBox#groupPlayer2Connected:unchecked,
-QGroupBox#groupPlayer3Connected:unchecked,
-QGroupBox#groupPlayer4Connected:unchecked,
-QGroupBox#groupPlayer5Connected:unchecked,
-QGroupBox#groupPlayer6Connected:unchecked,
-QGroupBox#groupPlayer7Connected:unchecked,
-QGroupBox#groupPlayer8Connected:unchecked {
-  border: 1px solid #32414b;
-}
-
-QGroupBox#groupPlayer1Connected::title,
-QGroupBox#groupPlayer2Connected::title,
-QGroupBox#groupPlayer3Connected::title,
-QGroupBox#groupPlayer4Connected::title,
-QGroupBox#groupPlayer5Connected::title,
-QGroupBox#groupPlayer6Connected::title,
-QGroupBox#groupPlayer7Connected::title,
-QGroupBox#groupPlayer8Connected::title {
-  subcontrol-origin: margin;
-  subcontrol-position: top left;
-  padding-left: 0px;
-  padding-right: 0px;
-  padding-top: 1px;
-  margin-left: -2px;
-  margin-right: -4px;
-  margin-bottom: 6px;
-}
-
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-  spacing: 0px;
-}
-
-QWidget#connectedControllers QLabel {
-  padding: 0px;
-}
-
-QWidget#Player1LEDs,
-QWidget#Player2LEDs,
-QWidget#Player3LEDs,
-QWidget#Player4LEDs,
-QWidget#Player5LEDs,
-QWidget#Player6LEDs,
-QWidget#Player7LEDs,
-QWidget#Player8LEDs {
-  background: transparent;
-}
-
-QWidget#Player1LEDs QCheckBox,
-QWidget#Player2LEDs QCheckBox,
-QWidget#Player3LEDs QCheckBox,
-QWidget#Player4LEDs QCheckBox,
-QWidget#Player5LEDs QCheckBox,
-QWidget#Player6LEDs QCheckBox,
-QWidget#Player7LEDs QCheckBox,
-QWidget#Player8LEDs QCheckBox,
-QCheckBox#checkboxPlayer1Connected,
-QCheckBox#checkboxPlayer2Connected,
-QCheckBox#checkboxPlayer3Connected,
-QCheckBox#checkboxPlayer4Connected,
-QCheckBox#checkboxPlayer5Connected,
-QCheckBox#checkboxPlayer6Connected,
-QCheckBox#checkboxPlayer7Connected,
-QCheckBox#checkboxPlayer8Connected {
-  spacing: 0px;
-  padding-top: 0px;
-  padding-bottom: 0px;
-  background: transparent;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator,
-QWidget#Player2LEDs QCheckBox::indicator,
-QWidget#Player3LEDs QCheckBox::indicator,
-QWidget#Player4LEDs QCheckBox::indicator,
-QWidget#Player5LEDs QCheckBox::indicator,
-QWidget#Player6LEDs QCheckBox::indicator,
-QWidget#Player7LEDs QCheckBox::indicator,
-QWidget#Player8LEDs QCheckBox::indicator {
-  width: 6px;
-  height: 6px;
-  margin-left: 0px;
-}
-
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer1Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer2Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer3Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer4Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer5Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer6Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer7Connected::indicator,
-QWidget#bottomPerGameInput QCheckBox#checkboxPlayer8Connected::indicator {
-  width: 12px;
-  height: 12px;
-}
-
-QCheckBox#checkboxPlayer1Connected::indicator,
-QCheckBox#checkboxPlayer2Connected::indicator,
-QCheckBox#checkboxPlayer3Connected::indicator,
-QCheckBox#checkboxPlayer4Connected::indicator,
-QCheckBox#checkboxPlayer5Connected::indicator,
-QCheckBox#checkboxPlayer6Connected::indicator,
-QCheckBox#checkboxPlayer7Connected::indicator,
-QCheckBox#checkboxPlayer8Connected::indicator {
-  width: 14px;
-  height: 14px;
-  margin-left: 0px;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:checked,
-QWidget#Player2LEDs QCheckBox::indicator:checked,
-QWidget#Player3LEDs QCheckBox::indicator:checked,
-QWidget#Player4LEDs QCheckBox::indicator:checked,
-QWidget#Player5LEDs QCheckBox::indicator:checked,
-QWidget#Player6LEDs QCheckBox::indicator:checked,
-QWidget#Player7LEDs QCheckBox::indicator:checked,
-QWidget#Player8LEDs QCheckBox::indicator:checked,
-QGroupBox#groupPlayer1Connected::indicator:checked,
-QGroupBox#groupPlayer2Connected::indicator:checked,
-QGroupBox#groupPlayer3Connected::indicator:checked,
-QGroupBox#groupPlayer4Connected::indicator:checked,
-QGroupBox#groupPlayer5Connected::indicator:checked,
-QGroupBox#groupPlayer6Connected::indicator:checked,
-QGroupBox#groupPlayer7Connected::indicator:checked,
-QGroupBox#groupPlayer8Connected::indicator:checked,
-QCheckBox#checkboxPlayer1Connected::indicator:checked,
-QCheckBox#checkboxPlayer2Connected::indicator:checked,
-QCheckBox#checkboxPlayer3Connected::indicator:checked,
-QCheckBox#checkboxPlayer4Connected::indicator:checked,
-QCheckBox#checkboxPlayer5Connected::indicator:checked,
-QCheckBox#checkboxPlayer6Connected::indicator:checked,
-QCheckBox#checkboxPlayer7Connected::indicator:checked,
-QCheckBox#checkboxPlayer8Connected::indicator:checked,
-QGroupBox#groupConnectedController::indicator:checked {
-  border-radius: 2px;
-  border: 1px solid #929192;
-  background: #39ff14;
-  image: none;
-}
-
-QWidget#Player1LEDs QCheckBox::indicator:unchecked,
-QWidget#Player2LEDs QCheckBox::indicator:unchecked,
-QWidget#Player3LEDs QCheckBox::indicator:unchecked,
-QWidget#Player4LEDs QCheckBox::indicator:unchecked,
-QWidget#Player5LEDs QCheckBox::indicator:unchecked,
-QWidget#Player6LEDs QCheckBox::indicator:unchecked,
-QWidget#Player7LEDs QCheckBox::indicator:unchecked,
-QWidget#Player8LEDs QCheckBox::indicator:unchecked,
-QGroupBox#groupPlayer1Connected::indicator:unchecked,
-QGroupBox#groupPlayer2Connected::indicator:unchecked,
-QGroupBox#groupPlayer3Connected::indicator:unchecked,
-QGroupBox#groupPlayer4Connected::indicator:unchecked,
-QGroupBox#groupPlayer5Connected::indicator:unchecked,
-QGroupBox#groupPlayer6Connected::indicator:unchecked,
-QGroupBox#groupPlayer7Connected::indicator:unchecked,
-QGroupBox#groupPlayer8Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer1Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer2Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer3Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer4Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer5Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer6Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer7Connected::indicator:unchecked,
-QCheckBox#checkboxPlayer8Connected::indicator:unchecked,
-QGroupBox#groupConnectedController::indicator:unchecked {
-  border-radius: 2px;
-  border: 1px solid #929192;
-  background: #19232d;
-  image: none;
-}
-
-QWidget#controllerPlayer1,
-QWidget#controllerPlayer2,
-QWidget#controllerPlayer3,
-QWidget#controllerPlayer4,
-QWidget#controllerPlayer5,
-QWidget#controllerPlayer6,
-QWidget#controllerPlayer7,
-QWidget#controllerPlayer8 {
-  background: transparent;
-}
@@ -61,7 +61,9 @@ if (USE_DISCORD_PRESENCE)
 endif()

 # Sirit
-add_subdirectory(sirit)
+if (ENABLE_VULKAN)
+    add_subdirectory(sirit)
+endif()

 # libzip
 find_package(Libzip 1.5)
@@ -71,29 +73,23 @@ if (NOT LIBZIP_FOUND)
 endif()

 if (ENABLE_WEB_SERVICE)
-    find_package(OpenSSL 1.1)
-    if (OPENSSL_FOUND)
-        set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
-    else()
-        # LibreSSL
-        set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
-        set(OPENSSLDIR "/etc/ssl/")
-        add_subdirectory(libressl EXCLUDE_FROM_ALL)
-        target_include_directories(ssl INTERFACE ./libressl/include)
-        target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
-        get_directory_property(OPENSSL_LIBRARIES
-            DIRECTORY libressl
-            DEFINITION OPENSSL_LIBS)
-    endif()
+    # LibreSSL
+    set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
+    add_subdirectory(libressl EXCLUDE_FROM_ALL)
+    target_include_directories(ssl INTERFACE ./libressl/include)
+    target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
+    get_directory_property(OPENSSL_LIBRARIES
+        DIRECTORY libressl
+        DEFINITION OPENSSL_LIBS)
+
+    # lurlparser
+    add_subdirectory(lurlparser EXCLUDE_FROM_ALL)

    # httplib
    add_library(httplib INTERFACE)
    target_include_directories(httplib INTERFACE ./httplib)
    target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
    target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
-    if (WIN32)
-        target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32)
-    endif()
 endif()

 # Opus
@@ -1,187 +0,0 @@
-# FindFFmpeg
-# ----------
-#
-# Copyright 2019 Citra Emulator Project
-# Licensed under GPLv2 or any later version
-#
-# Find the native FFmpeg includes and libraries
-#
-# This module defines the following variables:
-#
-#  FFmpeg_INCLUDE_<component>: where to find <component>.h
-#  FFmpeg_LIBRARY_<component>: where to find the <component> library
-#  FFmpeg_INCLUDE_DIR: aggregate all the include paths
-#  FFmpeg_LIBRARIES: aggregate all the paths to the libraries
-#  FFmpeg_FOUND: True if all components have been found
-#
-# This module defines the following targets, which are prefered over variables:
-#
-#  FFmpeg::<component>: Target to use <component> directly, with include path,
-#    library and dependencies set up. If you are using a static build, you are
-#    responsible for adding any external dependencies (such as zlib, bzlib...).
-#
-# <component> can be one of:
-#   avcodec
-#   avdevice
-#   avfilter
-#   avformat
-#   avutil
-#   postproc
-#   swresample
-#   swscale
-#
-
-set(_FFmpeg_ALL_COMPONENTS
-    avcodec
-    avdevice
-    avfilter
-    avformat
-    avutil
-    postproc
-    swresample
-    swscale
-)
-
-set(_FFmpeg_DEPS_avcodec avutil)
-set(_FFmpeg_DEPS_avdevice avcodec avformat avutil)
-set(_FFmpeg_DEPS_avfilter avutil)
-set(_FFmpeg_DEPS_avformat avcodec avutil)
-set(_FFmpeg_DEPS_postproc avutil)
-set(_FFmpeg_DEPS_swresample avutil)
-set(_FFmpeg_DEPS_swscale avutil)
-
-function(find_ffmpeg LIBNAME)
-  if(DEFINED ENV{FFMPEG_DIR})
-    set(FFMPEG_DIR $ENV{FFMPEG_DIR})
-  endif()
-
-  if(FFMPEG_DIR)
-    list(APPEND INCLUDE_PATHS
-      ${FFMPEG_DIR}
-      ${FFMPEG_DIR}/ffmpeg
-      ${FFMPEG_DIR}/lib${LIBNAME}
-      ${FFMPEG_DIR}/include/lib${LIBNAME}
-      ${FFMPEG_DIR}/include/ffmpeg
-      ${FFMPEG_DIR}/include
-      NO_DEFAULT_PATH
-      NO_CMAKE_FIND_ROOT_PATH
-    )
-    list(APPEND LIB_PATHS
-      ${FFMPEG_DIR}
-      ${FFMPEG_DIR}/lib
-      ${FFMPEG_DIR}/lib${LIBNAME}
-      NO_DEFAULT_PATH
-      NO_CMAKE_FIND_ROOT_PATH
-    )
-  else()
-    list(APPEND INCLUDE_PATHS
-      /usr/local/include/ffmpeg
-      /usr/local/include/lib${LIBNAME}
-      /usr/include/ffmpeg
-      /usr/include/lib${LIBNAME}
-      /usr/include/ffmpeg/lib${LIBNAME}
-    )
-
-    list(APPEND LIB_PATHS
-      /usr/local/lib
-      /usr/lib
-    )
-  endif()
-
-  find_path(FFmpeg_INCLUDE_${LIBNAME} lib${LIBNAME}/${LIBNAME}.h
-    HINTS ${INCLUDE_PATHS}
-  )
-
-  find_library(FFmpeg_LIBRARY_${LIBNAME} ${LIBNAME}
-    HINTS ${LIB_PATHS}
-  )
-
-  if(NOT FFMPEG_DIR AND (NOT FFmpeg_LIBRARY_${LIBNAME} OR NOT FFmpeg_INCLUDE_${LIBNAME}))
-    # Didn't find it in the usual paths, try pkg-config
-    find_package(PkgConfig QUIET)
-    pkg_check_modules(FFmpeg_PKGCONFIG_${LIBNAME} QUIET lib${LIBNAME})
-
-    find_path(FFmpeg_INCLUDE_${LIBNAME} lib${LIBNAME}/${LIBNAME}.h
-      ${FFmpeg_PKGCONFIG_${LIBNAME}_INCLUDE_DIRS}
-    )
-
-    find_library(FFmpeg_LIBRARY_${LIBNAME} ${LIBNAME}
-      ${FFmpeg_PKGCONFIG_${LIBNAME}_LIBRARY_DIRS}
-    )
-  endif()
-
-  if(FFmpeg_INCLUDE_${LIBNAME} AND FFmpeg_LIBRARY_${LIBNAME})
-    set(FFmpeg_INCLUDE_${LIBNAME} "${FFmpeg_INCLUDE_${LIBNAME}}" PARENT_SCOPE)
-    set(FFmpeg_LIBRARY_${LIBNAME} "${FFmpeg_LIBRARY_${LIBNAME}}" PARENT_SCOPE)
-
-    # Extract FFmpeg version from version.h
-    foreach(v MAJOR MINOR MICRO)
-      set(FFmpeg_${LIBNAME}_VERSION_${v} 0)
-    endforeach()
-    string(TOUPPER ${LIBNAME} LIBNAME_UPPER)
-    file(STRINGS "${FFmpeg_INCLUDE_${LIBNAME}}/lib${LIBNAME}/version.h" _FFmpeg_VERSION_H_CONTENTS REGEX "#define LIB${LIBNAME_UPPER}_VERSION_(MAJOR|MINOR|MICRO) ")
-    set(_FFmpeg_VERSION_REGEX "([0-9]+)")
-    foreach(v MAJOR MINOR MICRO)
-      if("${_FFmpeg_VERSION_H_CONTENTS}" MATCHES "#define LIB${LIBNAME_UPPER}_VERSION_${v}[\\t ]+${_FFmpeg_VERSION_REGEX}")
-        set(FFmpeg_${LIBNAME}_VERSION_${v} "${CMAKE_MATCH_1}")
-      endif()
-    endforeach()
-    set(FFmpeg_${LIBNAME}_VERSION "${FFmpeg_${LIBNAME}_VERSION_MAJOR}.${FFmpeg_${LIBNAME}_VERSION_MINOR}.${FFmpeg_${LIBNAME}_VERSION_MICRO}")
-    set(FFmpeg_${c}_VERSION "${FFmpeg_${LIBNAME}_VERSION}" PARENT_SCOPE)
-    unset(_FFmpeg_VERSION_REGEX)
-    unset(_FFmpeg_VERSION_H_CONTENTS)
-
-    set(FFmpeg_${c}_FOUND TRUE PARENT_SCOPE)
-    if(NOT FFmpeg_FIND_QUIETLY)
-      message("--  Found ${LIBNAME}: ${FFmpeg_INCLUDE_${LIBNAME}} ${FFmpeg_LIBRARY_${LIBNAME}} (version: ${FFmpeg_${LIBNAME}_VERSION})")
-    endif()
-  endif()
-endfunction()
-
-foreach(c ${_FFmpeg_ALL_COMPONENTS})
-  find_ffmpeg(${c})
-endforeach()
-
-foreach(c ${_FFmpeg_ALL_COMPONENTS})
-  if(FFmpeg_${c}_FOUND)
-    list(APPEND FFmpeg_INCLUDE_DIR ${FFmpeg_INCLUDE_${c}})
-    list(APPEND FFmpeg_LIBRARIES ${FFmpeg_LIBRARY_${c}})
-
-    add_library(FFmpeg::${c} IMPORTED UNKNOWN)
-    set_target_properties(FFmpeg::${c} PROPERTIES
-      IMPORTED_LOCATION ${FFmpeg_LIBRARY_${c}}
-      INTERFACE_INCLUDE_DIRECTORIES ${FFmpeg_INCLUDE_${c}}
-    )
-    if(_FFmpeg_DEPS_${c})
-      set(deps)
-      foreach(dep ${_FFmpeg_DEPS_${c}})
-        list(APPEND deps FFmpeg::${dep})
-      endforeach()
-
-      set_target_properties(FFmpeg::${c} PROPERTIES
-        INTERFACE_LINK_LIBRARIES "${deps}"
-      )
-      unset(deps)
-    endif()
-  endif()
-endforeach()
-
-if(FFmpeg_INCLUDE_DIR)
-  list(REMOVE_DUPLICATES FFmpeg_INCLUDE_DIR)
-endif()
-
-foreach(c ${FFmpeg_FIND_COMPONENTS})
-  list(APPEND _FFmpeg_REQUIRED_VARS FFmpeg_INCLUDE_${c} FFmpeg_LIBRARY_${c})
-endforeach()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(FFmpeg
-  REQUIRED_VARS ${_FFmpeg_REQUIRED_VARS}
-  HANDLE_COMPONENTS
-)
-
-foreach(c ${_FFmpeg_ALL_COMPONENTS})
-  unset(_FFmpeg_DEPS_${c})
-endforeach()
-unset(_FFmpeg_ALL_COMPONENTS)
-unset(_FFmpeg_REQUIRED_VARS)
@@ -1,4 +1,4 @@
-From https://github.com/yhirose/cpp-httplib/tree/ff5677ad197947177c158fe857caff4f0e242045 with https://github.com/yhirose/cpp-httplib/pull/701
+From https://github.com/yhirose/cpp-httplib/tree/fce8e6fefdab4ad48bc5b25c98e5ebfda4f3cf53

 MIT License

@@ -1,150 +0,0 @@
-add_library(usb STATIC EXCLUDE_FROM_ALL
-    libusb/libusb/core.c
-    libusb/libusb/core.c
-    libusb/libusb/descriptor.c
-    libusb/libusb/hotplug.c
-    libusb/libusb/io.c
-    libusb/libusb/strerror.c
-    libusb/libusb/sync.c
-)
-set_target_properties(usb PROPERTIES VERSION 1.0.23)
-if(WIN32)
-    target_include_directories(usb
-        BEFORE
-        PUBLIC
-          libusb/libusb
-
-        PRIVATE
-          "${CMAKE_CURRENT_BINARY_DIR}"
-    )
-
-    if (NOT MINGW)
-        target_include_directories(usb BEFORE PRIVATE libusb/msvc)
-    endif()
-
-    # Works around other libraries providing their own definition of USB GUIDs (e.g. SDL2)
-    target_compile_definitions(usb PRIVATE "-DGUID_DEVINTERFACE_USB_DEVICE=(GUID){ 0xA5DCBF10, 0x6530, 0x11D2, {0x90, 0x1F, 0x00, 0xC0, 0x4F, 0xB9, 0x51, 0xED}}")
-else()
-target_include_directories(usb
-    # turns out other projects also have "config.h", so make sure the
-    # LibUSB one comes first
-    BEFORE
-
-    PUBLIC
-      libusb/libusb
-
-    PRIVATE
-      "${CMAKE_CURRENT_BINARY_DIR}"
-)
-endif()
-
-if(WIN32 OR CYGWIN)
-    target_sources(usb PRIVATE
-      libusb/libusb/os/threads_windows.c
-      libusb/libusb/os/windows_winusb.c
-      libusb/libusb/os/windows_usbdk.c
-      libusb/libusb/os/windows_nt_common.c
-    )
-    set(OS_WINDOWS TRUE)
-elseif(APPLE)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/darwin_usb.c
-    )
-    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-    find_library(IOKIT_LIBRARY IOKit)
-    find_library(OBJC_LIBRARY objc)
-    target_link_libraries(usb PRIVATE
-        ${COREFOUNDATION_LIBRARY}
-        ${IOKIT_LIBRARY}
-        ${OBJC_LIBRARY}
-    )
-    set(OS_DARWIN TRUE)
-elseif(ANDROID)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/linux_usbfs.c
-        libusb/libusb/os/linux_netlink.c
-    )
-    find_library(LOG_LIBRARY log)
-    target_link_libraries(usb PRIVATE ${LOG_LIBRARY})
-    set(OS_LINUX TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/linux_usbfs.c
-    )
-    find_package(Libudev)
-    if(LIBUDEV_FOUND)
-        target_sources(usb PRIVATE
-            libusb/libusb/os/linux_udev.c
-        )
-        target_link_libraries(usb PRIVATE "${LIBUDEV_LIBRARIES}")
-        target_include_directories(usb PRIVATE "${LIBUDEV_INCLUDE_DIR}")
-        set(HAVE_LIBUDEV TRUE)
-        set(USE_UDEV TRUE)
-    else()
-        target_sources(usb PRIVATE
-            libusb/libusb/os/linux_netlink.c
-        )
-    endif()
-    set(OS_LINUX TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/netbsd_usb.c
-    )
-    set(OS_NETBSD TRUE)
-elseif(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-    target_sources(usb PRIVATE
-        libusb/libusb/os/openbsd_usb.c
-    )
-    set(OS_OPENBSD TRUE)
-endif()
-
-if(UNIX)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/poll_posix.c
-        libusb/libusb/os/threads_posix.c
-    )
-    find_package(Threads REQUIRED)
-    if(THREADS_HAVE_PTHREAD_ARG)
-      target_compile_options(usb PUBLIC "-pthread")
-    endif()
-    if(CMAKE_THREAD_LIBS_INIT)
-      target_link_libraries(usb PRIVATE "${CMAKE_THREAD_LIBS_INIT}")
-    endif()
-    set(THREADS_POSIX TRUE)
-elseif(WIN32)
-    target_sources(usb PRIVATE
-        libusb/libusb/os/poll_windows.c
-        libusb/libusb/os/threads_windows.c
-    )
-endif()
-
-include(CheckFunctionExists)
-include(CheckIncludeFiles)
-include(CheckTypeSize)
-check_include_files(asm/types.h HAVE_ASM_TYPES_H)
-check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
-check_include_files(linux/filter.h HAVE_LINUX_FILTER_H)
-check_include_files(linux/netlink.h HAVE_LINUX_NETLINK_H)
-check_include_files(poll.h HAVE_POLL_H)
-check_include_files(signal.h HAVE_SIGNAL_H)
-check_include_files(strings.h HAVE_STRINGS_H)
-check_type_size("struct timespec" STRUCT_TIMESPEC)
-check_function_exists(syslog HAVE_SYSLOG_FUNC)
-check_include_files(syslog.h HAVE_SYSLOG_H)
-check_include_files(sys/socket.h HAVE_SYS_SOCKET_H)
-check_include_files(sys/time.h HAVE_SYS_TIME_H)
-check_include_files(sys/types.h HAVE_SYS_TYPES_H)
-
-set(CMAKE_EXTRA_INCLUDE_FILES poll.h)
-check_type_size("nfds_t" nfds_t)
-unset(CMAKE_EXTRA_INCLUDE_FILES)
-if(HAVE_NFDS_T)
-    set(POLL_NFDS_TYPE "nfds_t")
-else()
-    set(POLL_NFDS_TYPE "unsigned int")
-endif()
-
-check_include_files(sys/timerfd.h USBI_TIMERFD_AVAILABLE)
-
-
-configure_file(config.h.in config.h)
@@ -1,90 +0,0 @@
-/* Default visibility */
-#if defined(__GNUC__) || defined(__clang__)
-  #define DEFAULT_VISIBILITY __attribute__((visibility("default")))
-#elif defined(_MSC_VER)
-  #define DEFAULT_VISIBILITY __declspec(dllexport)
-#endif
-
-/* Start with debug message logging enabled */
-#undef ENABLE_DEBUG_LOGGING
-
-/* Message logging */
-#undef ENABLE_LOGGING
-
-/* Define to 1 if you have the <asm/types.h> header file. */
-#cmakedefine HAVE_ASM_TYPES_H 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#cmakedefine HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `udev' library (-ludev). */
-#cmakedefine HAVE_LIBUDEV 1
-
-/* Define to 1 if you have the <linux/filter.h> header file. */
-#cmakedefine HAVE_LINUX_FILTER_H 1
-
-/* Define to 1 if you have the <linux/netlink.h> header file. */
-#cmakedefine HAVE_LINUX_NETLINK_H 1
-
-/* Define to 1 if you have the <poll.h> header file. */
-#cmakedefine HAVE_POLL_H 1
-
-/* Define to 1 if you have the <signal.h> header file. */
-#cmakedefine HAVE_SIGNAL_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H 1
-
-/* Define to 1 if the system has the type `struct timespec'. */
-#cmakedefine HAVE_STRUCT_TIMESPEC 1
-
-/* syslog() function available */
-#cmakedefine HAVE_SYSLOG_FUNC 1
-
-/* Define to 1 if you have the <syslog.h> header file. */
-#cmakedefine HAVE_SYSLOG_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#cmakedefine HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#cmakedefine HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H 1
-
-/* Darwin backend */
-#cmakedefine OS_DARWIN 1
-
-/* Linux backend */
-#cmakedefine OS_LINUX 1
-
-/* NetBSD backend */
-#cmakedefine OS_NETBSD 1
-
-/* OpenBSD backend */
-#cmakedefine OS_OPENBSD 1
-
-/* Windows backend */
-#cmakedefine OS_WINDOWS 1
-
-/* type of second poll() argument */
-#define POLL_NFDS_TYPE @POLL_NFDS_TYPE@
-
-/* Use POSIX Threads */
-#cmakedefine THREADS_POSIX
-
-/* timerfd headers available */
-#cmakedefine USBI_TIMERFD_AVAILABLE 1
-
-/* Enable output to system log */
-#define USE_SYSTEM_LOGGING_FACILITY 1
-
-/* Use udev for device enumeration/hotplug */
-#cmakedefine USE_UDEV 1
-
-/* Use GNU extensions */
-#define _GNU_SOURCE
-
-/* Oldest Windows version supported */
-#define WINVER 0x0501
@@ -0,0 +1,8 @@
+add_library(lurlparser
+        LUrlParser.cpp
+        LUrlParser.h
+)
+
+create_target_directory_groups(lurlparser)
+
+target_include_directories(lurlparser INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
@@ -0,0 +1,265 @@
+/*
+ * Lightweight URL & URI parser (RFC 1738, RFC 3986)
+ * https://github.com/corporateshark/LUrlParser
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "LUrlParser.h"
+
+#include <algorithm>
+#include <cstring>
+#include <stdlib.h>
+
+// check if the scheme name is valid
+static bool IsSchemeValid( const std::string& SchemeName )
+{
+    for ( auto c : SchemeName  )
+    {
+        if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
+    }
+
+    return true;
+}
+
+bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
+{
+    if ( !IsValid() ) { return false; }
+
+    int Port = atoi( m_Port.c_str() );
+
+    if ( Port <= 0 || Port > 65535 ) { return false; }
+
+    if ( OutPort ) { *OutPort = Port; }
+
+    return true;
+}
+
+// based on RFC 1738 and RFC 3986
+LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
+{
+    LUrlParser::clParseURL Result;
+
+    const char* CurrentString = URL.c_str();
+
+    /*
+     *	<scheme>:<scheme-specific-part>
+     *	<scheme> := [a-z\+\-\.]+
+     *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
+     */
+
+    // try to read scheme
+    {
+        const char* LocalString = strchr( CurrentString, ':' );
+
+        if ( !LocalString )
+        {
+            return clParseURL( LUrlParserError_NoUrlCharacter );
+        }
+
+        // save the scheme name
+        Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
+
+        if ( !IsSchemeValid( Result.m_Scheme ) )
+        {
+            return clParseURL( LUrlParserError_InvalidSchemeName );
+        }
+
+        // scheme should be lowercase
+        std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
+
+        // skip ':'
+        CurrentString = LocalString+1;
+    }
+
+    /*
+     *	//<user>:<password>@<host>:<port>/<url-path>
+     *	any ":", "@" and "/" must be normalized
+     */
+
+    // skip "//"
+    if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
+    if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
+
+    // check if the user name and password are specified
+    bool bHasUserName = false;
+
+    const char* LocalString = CurrentString;
+
+    while ( *LocalString )
+    {
+        if ( *LocalString == '@' )
+        {
+            // user name and password are specified
+            bHasUserName = true;
+            break;
+        }
+        else if ( *LocalString == '/' )
+        {
+            // end of <host>:<port> specification
+            bHasUserName = false;
+            break;
+        }
+
+        LocalString++;
+    }
+
+    // user name and password
+    LocalString = CurrentString;
+
+    if ( bHasUserName )
+    {
+        // read user name
+        while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
+
+        Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
+
+        // proceed with the current pointer
+        CurrentString = LocalString;
+
+        if ( *CurrentString == ':' )
+        {
+            // skip ':'
+            CurrentString++;
+
+            // read password
+            LocalString = CurrentString;
+
+            while ( *LocalString && *LocalString != '@' ) LocalString++;
+
+            Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
+
+            CurrentString = LocalString;
+        }
+
+        // skip '@'
+        if ( *CurrentString != '@' )
+        {
+            return clParseURL( LUrlParserError_NoAtSign );
+        }
+
+        CurrentString++;
+    }
+
+    bool bHasBracket = ( *CurrentString == '[' );
+
+    // go ahead, read the host name
+    LocalString = CurrentString;
+
+    while ( *LocalString )
+    {
+        if ( bHasBracket && *LocalString == ']' )
+        {
+            // end of IPv6 address
+            LocalString++;
+            break;
+        }
+        else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
+        {
+            // port number is specified
+            break;
+        }
+
+        LocalString++;
+    }
+
+    Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
+
+    CurrentString = LocalString;
+
+    // is port number specified?
+    if ( *CurrentString == ':' )
+    {
+        CurrentString++;
+
+        // read port number
+        LocalString = CurrentString;
+
+        while ( *LocalString && *LocalString != '/' ) LocalString++;
+
+        Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
+
+        CurrentString = LocalString;
+    }
+
+    // end of string
+    if ( !*CurrentString )
+    {
+        Result.m_ErrorCode = LUrlParserError_Ok;
+
+        return Result;
+    }
+
+    // skip '/'
+    if ( *CurrentString != '/' )
+    {
+        return clParseURL( LUrlParserError_NoSlash );
+    }
+
+    CurrentString++;
+
+    // parse the path
+    LocalString = CurrentString;
+
+    while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
+
+    Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
+
+    CurrentString = LocalString;
+
+    // check for query
+    if ( *CurrentString == '?' )
+    {
+        // skip '?'
+        CurrentString++;
+
+        // read query
+        LocalString = CurrentString;
+
+        while ( *LocalString && *LocalString != '#' ) LocalString++;
+
+        Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
+
+        CurrentString = LocalString;
+    }
+
+    // check for fragment
+    if ( *CurrentString == '#' )
+    {
+        // skip '#'
+        CurrentString++;
+
+        // read fragment
+        LocalString = CurrentString;
+
+        while ( *LocalString ) LocalString++;
+
+        Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
+
+        CurrentString = LocalString;
+    }
+
+    Result.m_ErrorCode = LUrlParserError_Ok;
+
+    return Result;
+}
@@ -0,0 +1,78 @@
+/*
+ * Lightweight URL & URI parser (RFC 1738, RFC 3986)
+ * https://github.com/corporateshark/LUrlParser
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#include <string>
+
+namespace LUrlParser
+{
+enum LUrlParserError
+{
+    LUrlParserError_Ok = 0,
+    LUrlParserError_Uninitialized = 1,
+    LUrlParserError_NoUrlCharacter = 2,
+    LUrlParserError_InvalidSchemeName = 3,
+    LUrlParserError_NoDoubleSlash = 4,
+    LUrlParserError_NoAtSign = 5,
+    LUrlParserError_UnexpectedEndOfLine = 6,
+    LUrlParserError_NoSlash = 7,
+};
+
+class clParseURL
+{
+public:
+    LUrlParserError m_ErrorCode;
+    std::string m_Scheme;
+    std::string m_Host;
+    std::string m_Port;
+    std::string m_Path;
+    std::string m_Query;
+    std::string m_Fragment;
+    std::string m_UserName;
+    std::string m_Password;
+
+    clParseURL()
+            : m_ErrorCode( LUrlParserError_Uninitialized )
+    {}
+
+    /// return 'true' if the parsing was successful
+    bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
+
+    /// helper to convert the port number to int, return 'true' if the port is valid (within the 0..65535 range)
+    bool GetPort( int* OutPort ) const;
+
+    /// parse the URL
+    static clParseURL ParseURL( const std::string& URL );
+
+private:
+    explicit clParseURL( LUrlParserError ErrorCode )
+            : m_ErrorCode( ErrorCode )
+    {}
+};
+
+} // namespace LUrlParser
@@ -0,0 +1,19 @@
+From https://github.com/corporateshark/LUrlParser/commit/455d5e2d27e3946f11ad0328fee9ee2628e6a8e2
+
+MIT License
+
+===
+
+Lightweight URL & URI parser (RFC 1738, RFC 3986)
+
+(C) Sergey Kosarevsky, 2015
+
+@corporateshark sk@linderdaum.com
+
+http://www.linderdaum.com
+
+http://blog.linderdaum.com
+
+=============================
+
+A tiny and lightweight URL & URI parser (RFC 1738, RFC 3986) written in C++.
@@ -152,11 +152,9 @@ typedef uint16_t MicroProfileGroupId;

 #include <stdint.h>
 #include <string.h>
-#include <algorithm>
-#include <array>
-#include <atomic>
-#include <mutex>
 #include <thread>
+#include <mutex>
+#include <atomic>

 #ifndef MICROPROFILE_API
 #define MICROPROFILE_API
@@ -607,45 +605,28 @@ struct MicroProfileFrameState

 struct MicroProfileThreadLog
 {
-    std::array<MicroProfileLogEntry, MICROPROFILE_BUFFER_SIZE> Log{};
+    MicroProfileLogEntry    Log[MICROPROFILE_BUFFER_SIZE];

-    std::atomic<uint32_t>   nPut{0};
-    std::atomic<uint32_t>   nGet{0};
-    uint32_t                nActive = 0;
-    uint32_t                nGpu = 0;
-    ThreadIdType            nThreadId{};
+    std::atomic<uint32_t>   nPut;
+    std::atomic<uint32_t>   nGet;
+    uint32_t                nActive;
+    uint32_t                nGpu;
+    ThreadIdType            nThreadId;

-    std::array<uint32_t, MICROPROFILE_STACK_MAX> nStack{};
-    std::array<int64_t, MICROPROFILE_STACK_MAX>  nChildTickStack{};
-    uint32_t                                     nStackPos = 0;
+    uint32_t                nStack[MICROPROFILE_STACK_MAX];
+    int64_t                 nChildTickStack[MICROPROFILE_STACK_MAX];
+    uint32_t                nStackPos;


-    std::array<uint8_t, MICROPROFILE_MAX_GROUPS> nGroupStackPos{};
-    std::array<int64_t, MICROPROFILE_MAX_GROUPS> nGroupTicks{};
-    std::array<int64_t, MICROPROFILE_MAX_GROUPS> nAggregateGroupTicks{};
+    uint8_t                 nGroupStackPos[MICROPROFILE_MAX_GROUPS];
+    int64_t                 nGroupTicks[MICROPROFILE_MAX_GROUPS];
+    int64_t                 nAggregateGroupTicks[MICROPROFILE_MAX_GROUPS];
    enum
    {
        THREAD_MAX_LEN = 64,
    };
-    char                    ThreadName[64]{};
-    int                     nFreeListNext = 0;
-
-    void Reset() {
-        Log.fill({});
-        nPut = 0;
-        nGet = 0;
-        nActive = 0;
-        nGpu = 0;
-        nThreadId = {};
-        nStack.fill(0);
-        nChildTickStack.fill(0);
-        nStackPos = 0;
-        nGroupStackPos.fill(0);
-        nGroupTicks.fill(0);
-        nAggregateGroupTicks.fill(0);
-        std::fill(std::begin(ThreadName), std::end(ThreadName), '\0');
-        nFreeListNext = 0;
-    }
+    char                    ThreadName[64];
+    int                     nFreeListNext;
 };

 #if MICROPROFILE_GPU_TIMERS_D3D11
@@ -902,10 +883,8 @@ inline uint16_t MicroProfileGetGroupIndex(MicroProfileToken t)
 #include <windows.h>
 #define snprintf _snprintf

-#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4244)
-#endif
 int64_t MicroProfileTicksPerSecondCpu()
 {
    static int64_t nTicksPerSecond = 0;
@@ -948,11 +927,7 @@ typedef HANDLE MicroProfileThread;
 DWORD _stdcall ThreadTrampoline(void* pFunc)
 {
    MicroProfileThreadFunc F = (MicroProfileThreadFunc)pFunc;
-
-    // The return value of F will always return a void*, however, this is for
-    // compatibility with pthreads. The underlying "address" of the pointer
-    // is always a 32-bit value, so this cast is safe to perform.
-    return static_cast<DWORD>(reinterpret_cast<uint64_t>(F(0)));
+    return (uint32_t)F(0);
 }

 inline void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)
@@ -1043,7 +1018,7 @@ static void MicroProfileCreateThreadLogKey()
 #else
 MP_THREAD_LOCAL MicroProfileThreadLog* g_MicroProfileThreadLog = 0;
 #endif
-static std::atomic<bool> g_bUseLock{false}; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled)
+static bool g_bUseLock = false; /// This is used because windows does not support using mutexes under dll init(which is where global initialization is handled)


 MICROPROFILE_DEFINE(g_MicroProfileFlip, "MicroProfile", "MicroProfileFlip", 0x3355ee);
@@ -1176,7 +1151,6 @@ MicroProfileThreadLog* MicroProfileCreateThreadLog(const char* pName)
        MP_ASSERT(pLog->nPut.load() == 0);
        MP_ASSERT(pLog->nGet.load() == 0);
        S.nFreeListHead = S.Pool[S.nFreeListHead]->nFreeListNext;
-        pLog->Reset();
    }
    else
    {
@@ -1184,6 +1158,7 @@ MicroProfileThreadLog* MicroProfileCreateThreadLog(const char* pName)
        S.nMemUsage += sizeof(MicroProfileThreadLog);
        S.Pool[S.nNumLogs++] = pLog;
    }
+    memset(pLog, 0, sizeof(*pLog));
    int len = (int)strlen(pName);
    int maxlen = sizeof(pLog->ThreadName)-1;
    len = len < maxlen ? len : maxlen;
@@ -1231,8 +1206,8 @@ void MicroProfileOnThreadExit()
        {
            S.Frames[i].nLogStart[nLogIndex] = 0;
        }
-        pLog->nGroupStackPos.fill(0);
-        pLog->nGroupTicks.fill(0);
+        memset(pLog->nGroupStackPos, 0, sizeof(pLog->nGroupStackPos));
+        memset(pLog->nGroupTicks, 0, sizeof(pLog->nGroupTicks));
    }
 }

@@ -1748,10 +1723,10 @@ void MicroProfileFlip()
                            }
                        }
                    }
-                    for(uint32_t j = 0; j < MICROPROFILE_MAX_GROUPS; ++j)
+                    for(uint32_t i = 0; i < MICROPROFILE_MAX_GROUPS; ++i)
                    {
-                        pLog->nGroupTicks[j] += nGroupTicks[j];
-                        pFrameGroup[j] += nGroupTicks[j];
+                        pLog->nGroupTicks[i] += nGroupTicks[i];
+                        pFrameGroup[i] += nGroupTicks[i];
                    }
                    pLog->nStackPos = nStackPos;
                }
@@ -3334,7 +3309,7 @@ bool MicroProfileIsLocalThread(uint32_t nThreadId)
 #endif
 #else

-bool MicroProfileIsLocalThread([[maybe_unused]] uint32_t nThreadId) { return false; }
+bool MicroProfileIsLocalThread(uint32_t nThreadId){return false;}
 void MicroProfileStopContextSwitchTrace(){}
 void MicroProfileStartContextSwitchTrace(){}

@@ -3582,7 +3557,7 @@ int MicroProfileGetGpuTickReference(int64_t* pOutCpu, int64_t* pOutGpu)

 #undef S

-#ifdef _MSC_VER
+#ifdef _WIN32
 #pragma warning(pop)
 #endif

--- a/Show More
+++ b/Show More